diff --git a/index.html b/index.html
index 136fef4..c51b644 100644
--- a/index.html
+++ b/index.html
@@ -441,7 +441,7 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="font-weight: bold" href="/index.html">Home</a></li><li><a style="" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="font-weight: bold" href="index.html">Home</a></li><li><a style="" href="site/download.html">Download</a></li><li><a style="" href="site/developers.html">Developers</a></li><li><a style="" href="user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
 </div>
 </div>
 <div id="content">
@@ -478,6 +478,22 @@
 </tr>
 </table>
 </div>
+<div class="sect2">
+<h3 id="_external_links"><a class="anchor" href="#_external_links"></a>External links</h3>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="https://projects.eclipse.org/projects/technology.comma">Eclipse CommaSuite project page</a></p>
+</li>
+<li>
+<p><a href="https://gitlab.eclipse.org/eclipse/comma/comma">Gitlab</a></p>
+</li>
+<li>
+<p><a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/issues">Issue tracker</a></p>
+</li>
+</ul>
+</div>
+</div>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/commandline/commandline.html
similarity index 75%
copy from site/download.html
copy to site/commandline/commandline.html
index 1bafd3b..4fd5b3f 100644
--- a/site/download.html
+++ b/site/commandline/commandline.html
@@ -441,103 +441,131 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="../language/language.html">Language</a><ul class="sectlevel4"><li><a style="" href="../language/types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="../language/states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="../language/components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../tutorial/intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="../tutorial/preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../tutorial/serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="font-weight: bold" href="commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_command_line_tool"><a class="anchor" href="#_command_line_tool"></a>Command Line Tool</h2>
 <div class="sectionbody">
+<div class="sect2 normal">
+<h3 id="_tools"><a class="anchor" href="#_tools"></a>Tools</h3>
 <div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
-</li>
-</ul>
-</div>
-</li>
-<li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
-</li>
-<li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
-</li>
-</ol>
-</div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
-</div>
-<div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
-<div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
+<p>The command line version provides all the functions available from
+the Eclipse IDE but without user interface.
+It is distributed as an executable JAR file with name CommaSuite-X.X.X.jar
+where X.X.X encodes the version.</p>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
+<h3 id="_usage_from_command_line"><a class="anchor" href="#_usage_from_command_line"></a>Usage from Command Line</h3>
 <div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
+<p>To run the executable jar file it is required to have <strong>Java version 11</strong> or higher to be installed.
+Jar files in general can be run with the following command (args are arguments):</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>java -jar $jar_filename$ $args$</pre>
+</div>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
+<h3 id="_arguments"><a class="anchor" href="#_arguments"></a>Arguments</h3>
 <div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
-</li>
-<li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
-</li>
-<li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
-</li>
-<li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
-</li>
-</ul>
+<p>The CommaSuite jar accepts the following arguments:</p>
 </div>
 <div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
+<p>-l, --location; (required) Location of the .prj file or directory
+that contains the .prj file</p>
+</div>
+<div class="paragraph">
+<p>-v, --validation; Turns off validation</p>
+</div>
+<div class="paragraph">
+<p>-o, --output; Sets output location of the generated files</p>
+</div>
+<div class="paragraph">
+<p>-h, --help; Shows options</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_examples"><a class="anchor" href="#_examples"></a>Examples</h3>
+<div class="sect3">
+<h4 id="_location"><a class="anchor" href="#_location"></a>Location</h4>
+<div class="paragraph">
+<p>The jar requires you to provide at least a location that can either be
+the .prj file or a directory in which it can find the .prj file.
+The location argument can be an absolute or relative path.</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>java -jar CommaSuite-3.4.0.jar -l C:\IBoss_example\iboss.prj</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>uses the iboss.prj file for the generation.</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>java -jar CommaSuite-3.4.0.jar -l C:\IBoss_example\</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>runs the generation for all .prj files in the directory.</p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_output_location"><a class="anchor" href="#_output_location"></a>Output location</h4>
+<div class="paragraph">
+<p>By default the output location is the folder of the provided location argument.
+The CommaSuite framework will create two folders in the output location: "src-gen"
+that contains the generated code for the tasks in the .prj file, and "comma-gen"
+that contains the results of the execution of the monitoring tasks (if any).
+In order to change the default output location, an output argument can be provided
+as an absolute or relative path.</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>java -jar CommaSuite-3.4.0.jar -l C:\IBoss_example\iboss.prj</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>will use C:\IBoss_example\src-gen\ for generated code and C:\IBoss_example\comma-gen\
+for monitoring results.</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>java -jar CommaSuite-3.4.0.jar -l C:\IBoss_example\iboss.prj -o generated</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>will use C:\IBoss_example\generated\ as output location</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>java -jar CommaSuite-3.4.0.jar -l C:\IBoss_example\iboss.prj -o C:\generated\</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>will use C:\generated\ as output location</p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_validation"><a class="anchor" href="#_validation"></a>Validation</h4>
+<div class="paragraph">
+<p>By default the validation is turned ON. Warnings and errors will be printed to
+the console.
+Generation will continue when it encounters warnings but stops when one or more
+errors are found. Validation can be turned off by using the validation argument.</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>java -jar CommaSuite-3.4.0.jar -l C:\IBoss_example\iboss.prj -v</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>turns off validation</p>
+</div>
 </div>
 </div>
 </div>
diff --git a/site/eventfiles/eventfiles.html b/site/eventfiles/eventfiles.html
new file mode 100644
index 0000000..97f7e9d
--- /dev/null
+++ b/site/eventfiles/eventfiles.html
@@ -0,0 +1,879 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<meta name="generator" content="Asciidoctor 2.0.15">
+<link rel="icon" type="image/png" href="/favicon.png">
+<title>Eclipse CommaSuite</title>
+<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700">
+<style>
+/* Asciidoctor default stylesheet | MIT License | https://asciidoctor.org */
+/* Uncomment @import statement to use as custom stylesheet */
+/*@import "https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700";*/
+article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}
+audio,video{display:inline-block}
+audio:not([controls]){display:none;height:0}
+html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}
+a{background:none}
+a:focus{outline:thin dotted}
+a:active,a:hover{outline:0}
+h1{font-size:2em;margin:.67em 0}
+abbr[title]{border-bottom:1px dotted}
+b,strong{font-weight:bold}
+dfn{font-style:italic}
+hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}
+mark{background:#ff0;color:#000}
+code,kbd,pre,samp{font-family:monospace;font-size:1em}
+pre{white-space:pre-wrap}
+q{quotes:"\201C" "\201D" "\2018" "\2019"}
+small{font-size:80%}
+sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}
+sup{top:-.5em}
+sub{bottom:-.25em}
+img{border:0}
+svg:not(:root){overflow:hidden}
+figure{margin:0}
+fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}
+legend{border:0;padding:0}
+button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}
+button,input{line-height:normal}
+button,select{text-transform:none}
+button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}
+button[disabled],html input[disabled]{cursor:default}
+input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}
+button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}
+textarea{overflow:auto;vertical-align:top}
+table{border-collapse:collapse;border-spacing:0}
+*,*::before,*::after{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}
+html,body{font-size:100%}
+body{background:#fff;color:rgba(0,0,0,.8);padding:0;margin:0;font-family:"Noto Serif","DejaVu Serif",serif;font-weight:400;font-style:normal;line-height:1;position:relative;cursor:auto;tab-size:4;word-wrap:anywhere;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased}
+a:hover{cursor:pointer}
+img,object,embed{max-width:100%;height:auto}
+object,embed{height:100%}
+img{-ms-interpolation-mode:bicubic}
+.left{float:left!important}
+.right{float:right!important}
+.text-left{text-align:left!important}
+.text-right{text-align:right!important}
+.text-center{text-align:center!important}
+.text-justify{text-align:justify!important}
+.hide{display:none}
+img,object,svg{display:inline-block;vertical-align:middle}
+textarea{height:auto;min-height:50px}
+select{width:100%}
+.subheader,.admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{line-height:1.45;color:#7a2518;font-weight:400;margin-top:0;margin-bottom:.25em}
+div,dl,dt,dd,ul,ol,li,h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6,pre,form,p,blockquote,th,td{margin:0;padding:0}
+a{color:#2156a5;text-decoration:underline;line-height:inherit}
+a:hover,a:focus{color:#1d4b8f}
+a img{border:0}
+p{font-family:inherit;font-weight:400;font-size:1em;line-height:1.6;margin-bottom:1.25em;text-rendering:optimizeLegibility}
+p aside{font-size:.875em;line-height:1.35;font-style:italic}
+h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{font-family:"Open Sans","DejaVu Sans",sans-serif;font-weight:300;font-style:normal;color:#ba3925;text-rendering:optimizeLegibility;margin-top:1em;margin-bottom:.5em;line-height:1.0125em}
+h1 small,h2 small,h3 small,#toctitle small,.sidebarblock>.content>.title small,h4 small,h5 small,h6 small{font-size:60%;color:#e99b8f;line-height:0}
+h1{font-size:2.125em}
+h2{font-size:1.6875em}
+h3,#toctitle,.sidebarblock>.content>.title{font-size:1.375em}
+h4,h5{font-size:1.125em}
+h6{font-size:1em}
+hr{border:solid #dddddf;border-width:1px 0 0;clear:both;margin:1.25em 0 1.1875em;height:0}
+em,i{font-style:italic;line-height:inherit}
+strong,b{font-weight:bold;line-height:inherit}
+small{font-size:60%;line-height:inherit}
+code{font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;font-weight:400;color:rgba(0,0,0,.9)}
+ul,ol,dl{font-size:1em;line-height:1.6;margin-bottom:1.25em;list-style-position:outside;font-family:inherit}
+ul,ol{margin-left:1.5em}
+ul li ul,ul li ol{margin-left:1.25em;margin-bottom:0;font-size:1em}
+ul.square li ul,ul.circle li ul,ul.disc li ul{list-style:inherit}
+ul.square{list-style-type:square}
+ul.circle{list-style-type:circle}
+ul.disc{list-style-type:disc}
+ol li ul,ol li ol{margin-left:1.25em;margin-bottom:0}
+dl dt{margin-bottom:.3125em;font-weight:bold}
+dl dd{margin-bottom:1.25em}
+abbr,acronym{text-transform:uppercase;font-size:90%;color:rgba(0,0,0,.8);border-bottom:1px dotted #ddd;cursor:help}
+abbr{text-transform:none}
+blockquote{margin:0 0 1.25em;padding:.5625em 1.25em 0 1.1875em;border-left:1px solid #ddd}
+blockquote,blockquote p{line-height:1.6;color:rgba(0,0,0,.85)}
+@media screen and (min-width:768px){h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2}
+h1{font-size:2.75em}
+h2{font-size:2.3125em}
+h3,#toctitle,.sidebarblock>.content>.title{font-size:1.6875em}
+h4{font-size:1.4375em}}
+table{background:#fff;margin-bottom:1.25em;border:solid 1px #dedede;word-wrap:normal}
+table thead,table tfoot{background:#f7f8f7}
+table thead tr th,table thead tr td,table tfoot tr th,table tfoot tr td{padding:.5em .625em .625em;font-size:inherit;color:rgba(0,0,0,.8);text-align:left}
+table tr th,table tr td{padding:.5625em .625em;font-size:inherit;color:rgba(0,0,0,.8)}
+table tr.even,table tr.alt{background:#f8f8f7}
+table thead tr th,table tfoot tr th,table tbody tr td,table tr td,table tfoot tr td{line-height:1.6}
+h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2;word-spacing:-.05em}
+h1 strong,h2 strong,h3 strong,#toctitle strong,.sidebarblock>.content>.title strong,h4 strong,h5 strong,h6 strong{font-weight:400}
+.center{margin-left:auto;margin-right:auto}
+.stretch{width:100%}
+.clearfix::before,.clearfix::after,.float-group::before,.float-group::after{content:" ";display:table}
+.clearfix::after,.float-group::after{clear:both}
+:not(pre).nobreak{word-wrap:normal}
+:not(pre).nowrap{white-space:nowrap}
+:not(pre).pre-wrap{white-space:pre-wrap}
+:not(pre):not([class^=L])>code{font-size:.9375em;font-style:normal!important;letter-spacing:0;padding:.1em .5ex;word-spacing:-.15em;background:#f7f7f8;-webkit-border-radius:4px;border-radius:4px;line-height:1.45;text-rendering:optimizeSpeed}
+pre{color:rgba(0,0,0,.9);font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;line-height:1.45;text-rendering:optimizeSpeed}
+pre code,pre pre{color:inherit;font-size:inherit;line-height:inherit}
+pre>code{display:block}
+pre.nowrap,pre.nowrap pre{white-space:pre;word-wrap:normal}
+em em{font-style:normal}
+strong strong{font-weight:400}
+.keyseq{color:rgba(51,51,51,.8)}
+kbd{font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;display:inline-block;color:rgba(0,0,0,.8);font-size:.65em;line-height:1.45;background:#f7f7f7;border:1px solid #ccc;-webkit-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 0 rgba(0,0,0,.2),0 0 0 .1em white inset;box-shadow:0 1px 0 rgba(0,0,0,.2),0 0 0 .1em #fff inset;margin:0 .15em;padding:.2em .5em;vertical-align:middle;position:relative;top:-.1em;white-space:nowrap}
+.keyseq kbd:first-child{margin-left:0}
+.keyseq kbd:last-child{margin-right:0}
+.menuseq,.menuref{color:#000}
+.menuseq b:not(.caret),.menuref{font-weight:inherit}
+.menuseq{word-spacing:-.02em}
+.menuseq b.caret{font-size:1.25em;line-height:.8}
+.menuseq i.caret{font-weight:bold;text-align:center;width:.45em}
+b.button::before,b.button::after{position:relative;top:-1px;font-weight:400}
+b.button::before{content:"[";padding:0 3px 0 2px}
+b.button::after{content:"]";padding:0 2px 0 3px}
+p a>code:hover{color:rgba(0,0,0,.9)}
+#header,#content,#footnotes,#footer{width:100%;margin-left:auto;margin-right:auto;margin-top:0;margin-bottom:0;max-width:62.5em;*zoom:1;position:relative;padding-left:.9375em;padding-right:.9375em}
+#header::before,#header::after,#content::before,#content::after,#footnotes::before,#footnotes::after,#footer::before,#footer::after{content:" ";display:table}
+#header::after,#content::after,#footnotes::after,#footer::after{clear:both}
+#content{margin-top:1.25em}
+#content::before{content:none}
+#header>h1:first-child{color:rgba(0,0,0,.85);margin-top:2.25rem;margin-bottom:0}
+#header>h1:first-child+#toc{margin-top:8px;border-top:1px solid #dddddf}
+#header>h1:only-child,body.toc2 #header>h1:nth-last-child(2){border-bottom:1px solid #dddddf;padding-bottom:8px}
+#header .details{border-bottom:1px solid #dddddf;line-height:1.45;padding-top:.25em;padding-bottom:.25em;padding-left:.25em;color:rgba(0,0,0,.6);display:-ms-flexbox;display:-webkit-flex;display:flex;-ms-flex-flow:row wrap;-webkit-flex-flow:row wrap;flex-flow:row wrap}
+#header .details span:first-child{margin-left:-.125em}
+#header .details span.email a{color:rgba(0,0,0,.85)}
+#header .details br{display:none}
+#header .details br+span::before{content:"\00a0\2013\00a0"}
+#header .details br+span.author::before{content:"\00a0\22c5\00a0";color:rgba(0,0,0,.85)}
+#header .details br+span#revremark::before{content:"\00a0|\00a0"}
+#header #revnumber{text-transform:capitalize}
+#header #revnumber::after{content:"\00a0"}
+#content>h1:first-child:not([class]){color:rgba(0,0,0,.85);border-bottom:1px solid #dddddf;padding-bottom:8px;margin-top:0;padding-top:1rem;margin-bottom:1.25rem}
+#toc{border-bottom:1px solid #e7e7e9;padding-bottom:.5em}
+#toc>ul{margin-left:.125em}
+#toc ul.sectlevel0>li>a{font-style:italic}
+#toc ul.sectlevel0 ul.sectlevel1{margin:.5em 0}
+#toc ul{font-family:"Open Sans","DejaVu Sans",sans-serif;list-style-type:none}
+#toc li{line-height:1.3334;margin-top:.3334em}
+#toc a{text-decoration:none}
+#toc a:active{text-decoration:underline}
+#toctitle{color:#7a2518;font-size:1.2em}
+@media screen and (min-width:768px){#toctitle{font-size:1.375em}
+body.toc2{padding-left:15em;padding-right:0}
+#toc.toc2{margin-top:0!important;background:#f8f8f7;position:fixed;width:15em;left:0;top:0;border-right:1px solid #e7e7e9;border-top-width:0!important;border-bottom-width:0!important;z-index:1000;padding:1.25em 1em;height:100%;overflow:auto}
+#toc.toc2 #toctitle{margin-top:0;margin-bottom:.8rem;font-size:1.2em}
+#toc.toc2>ul{font-size:.9em;margin-bottom:0}
+#toc.toc2 ul ul{margin-left:0;padding-left:1em}
+#toc.toc2 ul.sectlevel0 ul.sectlevel1{padding-left:0;margin-top:.5em;margin-bottom:.5em}
+body.toc2.toc-right{padding-left:0;padding-right:15em}
+body.toc2.toc-right #toc.toc2{border-right-width:0;border-left:1px solid #e7e7e9;left:auto;right:0}}
+@media screen and (min-width:1280px){body.toc2{padding-left:20em;padding-right:0}
+#toc.toc2{width:20em}
+#toc.toc2 #toctitle{font-size:1.375em}
+#toc.toc2>ul{font-size:.95em}
+#toc.toc2 ul ul{padding-left:1.25em}
+body.toc2.toc-right{padding-left:0;padding-right:20em}}
+#content #toc{border-style:solid;border-width:1px;border-color:#e0e0dc;margin-bottom:1.25em;padding:1.25em;background:#f8f8f7;-webkit-border-radius:4px;border-radius:4px}
+#content #toc>:first-child{margin-top:0}
+#content #toc>:last-child{margin-bottom:0}
+#footer{max-width:none;background:rgba(0,0,0,.8);padding:1.25em}
+#footer-text{color:rgba(255,255,255,.8);line-height:1.44}
+#content{margin-bottom:.625em}
+.sect1{padding-bottom:.625em}
+@media screen and (min-width:768px){#content{margin-bottom:1.25em}
+.sect1{padding-bottom:1.25em}}
+.sect1:last-child{padding-bottom:0}
+.sect1+.sect1{border-top:1px solid #e7e7e9}
+#content h1>a.anchor,h2>a.anchor,h3>a.anchor,#toctitle>a.anchor,.sidebarblock>.content>.title>a.anchor,h4>a.anchor,h5>a.anchor,h6>a.anchor{position:absolute;z-index:1001;width:1.5ex;margin-left:-1.5ex;display:block;text-decoration:none!important;visibility:hidden;text-align:center;font-weight:400}
+#content h1>a.anchor::before,h2>a.anchor::before,h3>a.anchor::before,#toctitle>a.anchor::before,.sidebarblock>.content>.title>a.anchor::before,h4>a.anchor::before,h5>a.anchor::before,h6>a.anchor::before{content:"\00A7";font-size:.85em;display:block;padding-top:.1em}
+#content h1:hover>a.anchor,#content h1>a.anchor:hover,h2:hover>a.anchor,h2>a.anchor:hover,h3:hover>a.anchor,#toctitle:hover>a.anchor,.sidebarblock>.content>.title:hover>a.anchor,h3>a.anchor:hover,#toctitle>a.anchor:hover,.sidebarblock>.content>.title>a.anchor:hover,h4:hover>a.anchor,h4>a.anchor:hover,h5:hover>a.anchor,h5>a.anchor:hover,h6:hover>a.anchor,h6>a.anchor:hover{visibility:visible}
+#content h1>a.link,h2>a.link,h3>a.link,#toctitle>a.link,.sidebarblock>.content>.title>a.link,h4>a.link,h5>a.link,h6>a.link{color:#ba3925;text-decoration:none}
+#content h1>a.link:hover,h2>a.link:hover,h3>a.link:hover,#toctitle>a.link:hover,.sidebarblock>.content>.title>a.link:hover,h4>a.link:hover,h5>a.link:hover,h6>a.link:hover{color:#a53221}
+details,.audioblock,.imageblock,.literalblock,.listingblock,.stemblock,.videoblock{margin-bottom:1.25em}
+details>summary:first-of-type{cursor:pointer;display:list-item;outline:none;margin-bottom:.75em}
+.admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{text-rendering:optimizeLegibility;text-align:left;font-family:"Noto Serif","DejaVu Serif",serif;font-size:1rem;font-style:italic}
+table.tableblock.fit-content>caption.title{white-space:nowrap;width:0}
+.paragraph.lead>p,#preamble>.sectionbody>[class="paragraph"]:first-of-type p{font-size:1.21875em;line-height:1.6;color:rgba(0,0,0,.85)}
+table.tableblock #preamble>.sectionbody>[class="paragraph"]:first-of-type p{font-size:inherit}
+.admonitionblock>table{border-collapse:separate;border:0;background:none;width:100%}
+.admonitionblock>table td.icon{text-align:center;width:80px}
+.admonitionblock>table td.icon img{max-width:none}
+.admonitionblock>table td.icon .title{font-weight:bold;font-family:"Open Sans","DejaVu Sans",sans-serif;text-transform:uppercase}
+.admonitionblock>table td.content{padding-left:1.125em;padding-right:1.25em;border-left:1px solid #dddddf;color:rgba(0,0,0,.6);word-wrap:anywhere}
+.admonitionblock>table td.content>:last-child>:last-child{margin-bottom:0}
+.exampleblock>.content{border-style:solid;border-width:1px;border-color:#e6e6e6;margin-bottom:1.25em;padding:1.25em;background:#fff;-webkit-border-radius:4px;border-radius:4px}
+.exampleblock>.content>:first-child{margin-top:0}
+.exampleblock>.content>:last-child{margin-bottom:0}
+.sidebarblock{border-style:solid;border-width:1px;border-color:#dbdbd6;margin-bottom:1.25em;padding:1.25em;background:#f3f3f2;-webkit-border-radius:4px;border-radius:4px}
+.sidebarblock>:first-child{margin-top:0}
+.sidebarblock>:last-child{margin-bottom:0}
+.sidebarblock>.content>.title{color:#7a2518;margin-top:0;text-align:center}
+.exampleblock>.content>:last-child>:last-child,.exampleblock>.content .olist>ol>li:last-child>:last-child,.exampleblock>.content .ulist>ul>li:last-child>:last-child,.exampleblock>.content .qlist>ol>li:last-child>:last-child,.sidebarblock>.content>:last-child>:last-child,.sidebarblock>.content .olist>ol>li:last-child>:last-child,.sidebarblock>.content .ulist>ul>li:last-child>:last-child,.sidebarblock>.content .qlist>ol>li:last-child>:last-child{margin-bottom:0}
+.literalblock pre,.listingblock>.content>pre{-webkit-border-radius:4px;border-radius:4px;overflow-x:auto;padding:1em;font-size:.8125em}
+@media screen and (min-width:768px){.literalblock pre,.listingblock>.content>pre{font-size:.90625em}}
+@media screen and (min-width:1280px){.literalblock pre,.listingblock>.content>pre{font-size:1em}}
+.literalblock pre,.listingblock>.content>pre:not(.highlight),.listingblock>.content>pre[class="highlight"],.listingblock>.content>pre[class^="highlight "]{background:#f7f7f8}
+.literalblock.output pre{color:#f7f7f8;background:rgba(0,0,0,.9)}
+.listingblock>.content{position:relative}
+.listingblock code[data-lang]::before{display:none;content:attr(data-lang);position:absolute;font-size:.75em;top:.425rem;right:.5rem;line-height:1;text-transform:uppercase;color:inherit;opacity:.5}
+.listingblock:hover code[data-lang]::before{display:block}
+.listingblock.terminal pre .command::before{content:attr(data-prompt);padding-right:.5em;color:inherit;opacity:.5}
+.listingblock.terminal pre .command:not([data-prompt])::before{content:"$"}
+.listingblock pre.highlightjs{padding:0}
+.listingblock pre.highlightjs>code{padding:1em;-webkit-border-radius:4px;border-radius:4px}
+.listingblock pre.prettyprint{border-width:0}
+.prettyprint{background:#f7f7f8}
+pre.prettyprint .linenums{line-height:1.45;margin-left:2em}
+pre.prettyprint li{background:none;list-style-type:inherit;padding-left:0}
+pre.prettyprint li code[data-lang]::before{opacity:1}
+pre.prettyprint li:not(:first-child) code[data-lang]::before{display:none}
+table.linenotable{border-collapse:separate;border:0;margin-bottom:0;background:none}
+table.linenotable td[class]{color:inherit;vertical-align:top;padding:0;line-height:inherit;white-space:normal}
+table.linenotable td.code{padding-left:.75em}
+table.linenotable td.linenos{border-right:1px solid currentColor;opacity:.35;padding-right:.5em}
+pre.pygments .lineno{border-right:1px solid currentColor;opacity:.35;display:inline-block;margin-right:.75em}
+pre.pygments .lineno::before{content:"";margin-right:-.125em}
+.quoteblock{margin:0 1em 1.25em 1.5em;display:table}
+.quoteblock:not(.excerpt)>.title{margin-left:-1.5em;margin-bottom:.75em}
+.quoteblock blockquote,.quoteblock p{color:rgba(0,0,0,.85);font-size:1.15rem;line-height:1.75;word-spacing:.1em;letter-spacing:0;font-style:italic;text-align:justify}
+.quoteblock blockquote{margin:0;padding:0;border:0}
+.quoteblock blockquote::before{content:"\201c";float:left;font-size:2.75em;font-weight:bold;line-height:.6em;margin-left:-.6em;color:#7a2518;text-shadow:0 1px 2px rgba(0,0,0,.1)}
+.quoteblock blockquote>.paragraph:last-child p{margin-bottom:0}
+.quoteblock .attribution{margin-top:.75em;margin-right:.5ex;text-align:right}
+.verseblock{margin:0 1em 1.25em}
+.verseblock pre{font-family:"Open Sans","DejaVu Sans",sans;font-size:1.15rem;color:rgba(0,0,0,.85);font-weight:300;text-rendering:optimizeLegibility}
+.verseblock pre strong{font-weight:400}
+.verseblock .attribution{margin-top:1.25rem;margin-left:.5ex}
+.quoteblock .attribution,.verseblock .attribution{font-size:.9375em;line-height:1.45;font-style:italic}
+.quoteblock .attribution br,.verseblock .attribution br{display:none}
+.quoteblock .attribution cite,.verseblock .attribution cite{display:block;letter-spacing:-.025em;color:rgba(0,0,0,.6)}
+.quoteblock.abstract blockquote::before,.quoteblock.excerpt blockquote::before,.quoteblock .quoteblock blockquote::before{display:none}
+.quoteblock.abstract blockquote,.quoteblock.abstract p,.quoteblock.excerpt blockquote,.quoteblock.excerpt p,.quoteblock .quoteblock blockquote,.quoteblock .quoteblock p{line-height:1.6;word-spacing:0}
+.quoteblock.abstract{margin:0 1em 1.25em;display:block}
+.quoteblock.abstract>.title{margin:0 0 .375em;font-size:1.15em;text-align:center}
+.quoteblock.excerpt>blockquote,.quoteblock .quoteblock{padding:0 0 .25em 1em;border-left:.25em solid #dddddf}
+.quoteblock.excerpt,.quoteblock .quoteblock{margin-left:0}
+.quoteblock.excerpt blockquote,.quoteblock.excerpt p,.quoteblock .quoteblock blockquote,.quoteblock .quoteblock p{color:inherit;font-size:1.0625rem}
+.quoteblock.excerpt .attribution,.quoteblock .quoteblock .attribution{color:inherit;font-size:.85rem;text-align:left;margin-right:0}
+p.tableblock:last-child{margin-bottom:0}
+td.tableblock>.content{margin-bottom:1.25em;word-wrap:anywhere}
+td.tableblock>.content>:last-child{margin-bottom:-1.25em}
+table.tableblock,th.tableblock,td.tableblock{border:0 solid #dedede}
+table.grid-all>*>tr>*{border-width:1px}
+table.grid-cols>*>tr>*{border-width:0 1px}
+table.grid-rows>*>tr>*{border-width:1px 0}
+table.frame-all{border-width:1px}
+table.frame-ends{border-width:1px 0}
+table.frame-sides{border-width:0 1px}
+table.frame-none>colgroup+*>:first-child>*,table.frame-sides>colgroup+*>:first-child>*{border-top-width:0}
+table.frame-none>:last-child>:last-child>*,table.frame-sides>:last-child>:last-child>*{border-bottom-width:0}
+table.frame-none>*>tr>:first-child,table.frame-ends>*>tr>:first-child{border-left-width:0}
+table.frame-none>*>tr>:last-child,table.frame-ends>*>tr>:last-child{border-right-width:0}
+table.stripes-all tr,table.stripes-odd tr:nth-of-type(odd),table.stripes-even tr:nth-of-type(even),table.stripes-hover tr:hover{background:#f8f8f7}
+th.halign-left,td.halign-left{text-align:left}
+th.halign-right,td.halign-right{text-align:right}
+th.halign-center,td.halign-center{text-align:center}
+th.valign-top,td.valign-top{vertical-align:top}
+th.valign-bottom,td.valign-bottom{vertical-align:bottom}
+th.valign-middle,td.valign-middle{vertical-align:middle}
+table thead th,table tfoot th{font-weight:bold}
+tbody tr th{background:#f7f8f7}
+tbody tr th,tbody tr th p,tfoot tr th,tfoot tr th p{color:rgba(0,0,0,.8);font-weight:bold}
+p.tableblock>code:only-child{background:none;padding:0}
+p.tableblock{font-size:1em}
+ol{margin-left:1.75em}
+ul li ol{margin-left:1.5em}
+dl dd{margin-left:1.125em}
+dl dd:last-child,dl dd:last-child>:last-child{margin-bottom:0}
+ol>li p,ul>li p,ul dd,ol dd,.olist .olist,.ulist .ulist,.ulist .olist,.olist .ulist{margin-bottom:.625em}
+ul.checklist,ul.none,ol.none,ul.no-bullet,ol.no-bullet,ol.unnumbered,ul.unstyled,ol.unstyled{list-style-type:none}
+ul.no-bullet,ol.no-bullet,ol.unnumbered{margin-left:.625em}
+ul.unstyled,ol.unstyled{margin-left:0}
+ul.checklist{margin-left:.625em}
+ul.checklist li>p:first-child>.fa-square-o:first-child,ul.checklist li>p:first-child>.fa-check-square-o:first-child{width:1.25em;font-size:.8em;position:relative;bottom:.125em}
+ul.checklist li>p:first-child>input[type="checkbox"]:first-child{margin-right:.25em}
+ul.inline{display:-ms-flexbox;display:-webkit-box;display:flex;-ms-flex-flow:row wrap;-webkit-flex-flow:row wrap;flex-flow:row wrap;list-style:none;margin:0 0 .625em -1.25em}
+ul.inline>li{margin-left:1.25em}
+.unstyled dl dt{font-weight:400;font-style:normal}
+ol.arabic{list-style-type:decimal}
+ol.decimal{list-style-type:decimal-leading-zero}
+ol.loweralpha{list-style-type:lower-alpha}
+ol.upperalpha{list-style-type:upper-alpha}
+ol.lowerroman{list-style-type:lower-roman}
+ol.upperroman{list-style-type:upper-roman}
+ol.lowergreek{list-style-type:lower-greek}
+.hdlist>table,.colist>table{border:0;background:none}
+.hdlist>table>tbody>tr,.colist>table>tbody>tr{background:none}
+td.hdlist1,td.hdlist2{vertical-align:top;padding:0 .625em}
+td.hdlist1{font-weight:bold;padding-bottom:1.25em}
+td.hdlist2{word-wrap:anywhere}
+.literalblock+.colist,.listingblock+.colist{margin-top:-.5em}
+.colist td:not([class]):first-child{padding:.4em .75em 0;line-height:1;vertical-align:top}
+.colist td:not([class]):first-child img{max-width:none}
+.colist td:not([class]):last-child{padding:.25em 0}
+.thumb,.th{line-height:0;display:inline-block;border:solid 4px #fff;-webkit-box-shadow:0 0 0 1px #ddd;box-shadow:0 0 0 1px #ddd}
+.imageblock.left{margin:.25em .625em 1.25em 0}
+.imageblock.right{margin:.25em 0 1.25em .625em}
+.imageblock>.title{margin-bottom:0}
+.imageblock.thumb,.imageblock.th{border-width:6px}
+.imageblock.thumb>.title,.imageblock.th>.title{padding:0 .125em}
+.image.left,.image.right{margin-top:.25em;margin-bottom:.25em;display:inline-block;line-height:0}
+.image.left{margin-right:.625em}
+.image.right{margin-left:.625em}
+a.image{text-decoration:none;display:inline-block}
+a.image object{pointer-events:none}
+sup.footnote,sup.footnoteref{font-size:.875em;position:static;vertical-align:super}
+sup.footnote a,sup.footnoteref a{text-decoration:none}
+sup.footnote a:active,sup.footnoteref a:active{text-decoration:underline}
+#footnotes{padding-top:.75em;padding-bottom:.75em;margin-bottom:.625em}
+#footnotes hr{width:20%;min-width:6.25em;margin:-.25em 0 .75em;border-width:1px 0 0}
+#footnotes .footnote{padding:0 .375em 0 .225em;line-height:1.3334;font-size:.875em;margin-left:1.2em;margin-bottom:.2em}
+#footnotes .footnote a:first-of-type{font-weight:bold;text-decoration:none;margin-left:-1.05em}
+#footnotes .footnote:last-of-type{margin-bottom:0}
+#content #footnotes{margin-top:-.625em;margin-bottom:0;padding:.75em 0}
+.gist .file-data>table{border:0;background:#fff;width:100%;margin-bottom:0}
+.gist .file-data>table td.line-data{width:99%}
+div.unbreakable{page-break-inside:avoid}
+.big{font-size:larger}
+.small{font-size:smaller}
+.underline{text-decoration:underline}
+.overline{text-decoration:overline}
+.line-through{text-decoration:line-through}
+.aqua{color:#00bfbf}
+.aqua-background{background:#00fafa}
+.black{color:#000}
+.black-background{background:#000}
+.blue{color:#0000bf}
+.blue-background{background:#0000fa}
+.fuchsia{color:#bf00bf}
+.fuchsia-background{background:#fa00fa}
+.gray{color:#606060}
+.gray-background{background:#7d7d7d}
+.green{color:#006000}
+.green-background{background:#007d00}
+.lime{color:#00bf00}
+.lime-background{background:#00fa00}
+.maroon{color:#600000}
+.maroon-background{background:#7d0000}
+.navy{color:#000060}
+.navy-background{background:#00007d}
+.olive{color:#606000}
+.olive-background{background:#7d7d00}
+.purple{color:#600060}
+.purple-background{background:#7d007d}
+.red{color:#bf0000}
+.red-background{background:#fa0000}
+.silver{color:#909090}
+.silver-background{background:#bcbcbc}
+.teal{color:#006060}
+.teal-background{background:#007d7d}
+.white{color:#bfbfbf}
+.white-background{background:#fafafa}
+.yellow{color:#bfbf00}
+.yellow-background{background:#fafa00}
+span.icon>.fa{cursor:default}
+a span.icon>.fa{cursor:inherit}
+.admonitionblock td.icon [class^="fa icon-"]{font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
+.admonitionblock td.icon .icon-note::before{content:"\f05a";color:#19407c}
+.admonitionblock td.icon .icon-tip::before{content:"\f0eb";text-shadow:1px 1px 2px rgba(155,155,0,.8);color:#111}
+.admonitionblock td.icon .icon-warning::before{content:"\f071";color:#bf6900}
+.admonitionblock td.icon .icon-caution::before{content:"\f06d";color:#bf3400}
+.admonitionblock td.icon .icon-important::before{content:"\f06a";color:#bf0000}
+.conum[data-value]{display:inline-block;color:#fff!important;background:rgba(0,0,0,.8);-webkit-border-radius:50%;border-radius:50%;text-align:center;font-size:.75em;width:1.67em;height:1.67em;line-height:1.67em;font-family:"Open Sans","DejaVu Sans",sans-serif;font-style:normal;font-weight:bold}
+.conum[data-value] *{color:#fff!important}
+.conum[data-value]+b{display:none}
+.conum[data-value]::after{content:attr(data-value)}
+pre .conum[data-value]{position:relative;top:-.125em}
+b.conum *{color:inherit!important}
+.conum:not([data-value]):empty{display:none}
+dt,th.tableblock,td.content,div.footnote{text-rendering:optimizeLegibility}
+h1,h2,p,td.content,span.alt{letter-spacing:-.01em}
+p strong,td.content strong,div.footnote strong{letter-spacing:-.005em}
+p,blockquote,dt,td.content,span.alt{font-size:1.0625rem}
+p{margin-bottom:1.25rem}
+.sidebarblock p,.sidebarblock dt,.sidebarblock td.content,p.tableblock{font-size:1em}
+.exampleblock>.content{background:#fffef7;border-color:#e0e0dc;-webkit-box-shadow:0 1px 4px #e0e0dc;box-shadow:0 1px 4px #e0e0dc}
+.print-only{display:none!important}
+@page{margin:1.25cm .75cm}
+@media print{*{-webkit-box-shadow:none!important;box-shadow:none!important;text-shadow:none!important}
+html{font-size:80%}
+a{color:inherit!important;text-decoration:underline!important}
+a.bare,a[href^="#"],a[href^="mailto:"]{text-decoration:none!important}
+a[href^="http:"]:not(.bare)::after,a[href^="https:"]:not(.bare)::after{content:"(" attr(href) ")";display:inline-block;font-size:.875em;padding-left:.25em}
+abbr[title]::after{content:" (" attr(title) ")"}
+pre,blockquote,tr,img,object,svg{page-break-inside:avoid}
+thead{display:table-header-group}
+svg{max-width:100%}
+p,blockquote,dt,td.content{font-size:1em;orphans:3;widows:3}
+h2,h3,#toctitle,.sidebarblock>.content>.title{page-break-after:avoid}
+#header,#content,#footnotes,#footer{max-width:none}
+#toc,.sidebarblock,.exampleblock>.content{background:none!important}
+#toc{border-bottom:1px solid #dddddf!important;padding-bottom:0!important}
+body.book #header{text-align:center}
+body.book #header>h1:first-child{border:0!important;margin:2.5em 0 1em}
+body.book #header .details{border:0!important;display:block;padding:0!important}
+body.book #header .details span:first-child{margin-left:0!important}
+body.book #header .details br{display:block}
+body.book #header .details br+span::before{content:none!important}
+body.book #toc{border:0!important;text-align:left!important;padding:0!important;margin:0!important}
+body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-break-before:always}
+.listingblock code[data-lang]::before{display:block}
+#footer{padding:0 .9375em}
+.hide-on-print{display:none!important}
+.print-only{display:block!important}
+.hide-for-print{display:none!important}
+.show-for-print{display:inherit!important}}
+@media print,amzn-kf8{#header>h1:first-child{margin-top:1.25rem}
+.sect1{padding:0!important}
+.sect1+.sect1{border:0}
+#footer{background:none}
+#footer-text{color:rgba(0,0,0,.6);font-size:.9em}}
+@media amzn-kf8{#header,#content,#footnotes,#footer{padding:0}}
+</style>
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+</head>
+<body class="article toc2 toc-left">
+<div id="header">
+<div id="toc" class="toc2">
+<div id="toctitle">Index</div>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="../language/language.html">Language</a><ul class="sectlevel4"><li><a style="" href="../language/types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="../language/states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="../language/components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../tutorial/intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="../tutorial/preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../tutorial/serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="font-weight: bold" href="eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
+</div>
+</div>
+<div id="content">
+<div class="sect1">
+<h2 id="_structure_of_event_files"><a class="anchor" href="#_structure_of_event_files"></a>Structure of Event Files</h2>
+<div class="sectionbody">
+<div class="sect2 normal">
+<h3 id="_introduction"><a class="anchor" href="#_introduction"></a>Introduction</h3>
+<div class="paragraph">
+<p>Event files (extension .events) contain a sequence of events as a result of client-server interactions where servers are usually components that implement CommaSuite interfaces. Events are commands, signals, notifications and replies to commands. They are defined in a CommaSuite interface signature.</p>
+</div>
+<div class="paragraph">
+<p>Event files are not intended to be manually constructed by the users. Usually they are automatically generated from existing system logs and observed client-server communication. The file structure is optimized for machine processing.</p>
+</div>
+<div class="paragraph">
+<p>This document describes the format of event files. The target audience is engineers that implement event file generators and users that specify small trace files for experimentation purposes.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_structure"><a class="anchor" href="#_structure"></a>Structure</h3>
+<div class="paragraph">
+<p>Event files have the following sections:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Imports of the used CommaSuite signatures and component models (optional)</p>
+</li>
+<li>
+<p>Declaration of connections</p>
+</li>
+<li>
+<p>Optional declaration of component instances</p>
+</li>
+<li>
+<p>Events</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p><strong>Important</strong>: event files must not contain multiline comments. Single line comments are allowed only on separate lines and between events. In general, it is advisable to avoid comments in these files.</p>
+</div>
+<div class="paragraph">
+<p><span class="maroon">import</span> <span class="blue">"../IImaging.signature"</span><br>
+<span class="maroon">import</span> <span class="blue">"../ITemprature.signature"</span><br>
+<span class="maroon">import</span> <span class="blue">"../IVacuum.signature"</span><br>
+<span class="maroon">import</span> <span class="blue">"../Imaging.component"</span></p>
+</div>
+<div class="paragraph">
+<p><span class="maroon">connections</span><br>
+(Client1, p1, IImaging, 0 c0, iImagPort)<br>
+(Client2, p2, ITemprature, 0 c0, iTempPort)<br>
+(Client3, p3, IVacuum, 0 c0, iVacPort)</p>
+</div>
+<div class="paragraph">
+<p><span class="maroon">components</span><br>
+Imaging c0</p>
+</div>
+<div class="paragraph">
+<p><span class="maroon">events</span><br></p>
+</div>
+<div class="paragraph">
+<p><span class="maroon">command</span> 1.0 0.0 Client2 p2 c0 iTempPort ITemperature SetTemperature<br>
+int 80<br>
+<span class="maroon">End</span></p>
+</div>
+<div class="paragraph">
+<p><span class="maroon">Reply</span> 1.002 0.002 c0 iTempPort Client2 p2 ITemperature SetTemperature<br>
+<span class="maroon">End</span></p>
+</div>
+<div class="sect3">
+<h4 id="_connections_and_component_instances"><a class="anchor" href="#_connections_and_component_instances"></a>Connections and Component Instances</h4>
+<div class="paragraph">
+<p>A connection represents the usage of an interface by a single client. The interface is provided by a server.</p>
+</div>
+<div class="paragraph">
+<p>Connection structure:</p>
+</div>
+<div class="paragraph">
+<p><em>(client_id, client_port, interface_name, server_id, server_port)</em></p>
+</div>
+<div class="paragraph">
+<p>Client and server identifiers are symbolic names that denote communicating parties. The identifiers are unique in the scope of the events file. A communication party can play the role of a client in one connection and the role of a server in another one. For example, a component instance with a given name (declared in the component declarations section) can be a server for connections on the provided ports, and a client for the connections originating from its required ports.</p>
+</div>
+<div class="paragraph">
+<p>An events file has to contain at least one connection declaration and may optionally contain declarations of component instances. If component instances are declared and used in the connections then the port names and their interfaces as given in the component definition must be used consistently in the connections. This is explained below.</p>
+</div>
+<div class="paragraph">
+<p>In the example, a single component instance <em>c0</em> of type <em>Imaging</em> is declared. The definition of <em>Imaging</em> is as follows (as a part of a definition not fully shown here):</p>
+</div>
+<div class="paragraph">
+<p><span class="maroon">component</span> Imaging</p>
+</div>
+<div class="paragraph">
+<p><span class="maroon">provided port</span> IImaging iImagPort</p>
+</div>
+<div class="paragraph">
+<p><span class="maroon">provided port</span> ITemperature iTempPort</p>
+</div>
+<div class="paragraph">
+<p><span class="maroon">provided port</span> IVacuum iVacPort</p>
+</div>
+<div class="paragraph">
+<p>The names of the ports in the definition have to be used in the connections in which c0 participates. In the example file there is one client for each port (<em>Client1</em>, <em>Client2</em>, and <em>Client3</em> respectively). This is captured in the declaration of three connections. As can be seen, the server ports and the associated interfaces match the component definition. The client identifiers and the client ports in this case are just names, there is no component declaration for them.</p>
+</div>
+<div class="paragraph">
+<p>It is possible that a component instance is a client for another component instance. In this case the client port name in a connection must be equal to the name of a required port in the component definition. Circular connections in which a communicating party is a direct client of itself in the same connection are not allowed.</p>
+</div>
+<div class="paragraph">
+<p>It is allowed to declare multiple component instances with different identifiers. Multiple component types can be used in component instance declarations.</p>
+</div>
+<div class="paragraph">
+<p>There is a validity check for events that involve component instances:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>if a component instance is a client or a server in an event then the corresponding client or server port must be defined in the component model</p>
+</li>
+<li>
+<p>an incoming event to a provided port must be a command or a signal in the port&#8217;s interface; conversely, an event originating from a provided port must be a reply or a notification</p>
+</li>
+<li>
+<p>an incoming event to a required port must be a reply or a notification; an event from a required port must be a command or a signal</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>A violation of the rules above will be indicated as an error in the events file editor when used in the Eclipse IDE. This is useful when the engineers experiment with small manually created event files in order to understand the file structure.</p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_events"><a class="anchor" href="#_events"></a>Events</h4>
+<div class="paragraph">
+<p>Events are occurrences of commands and their replies, signals and notifications as defined in a CommaSuite signature.</p>
+</div>
+<div class="paragraph">
+<p>An event has the following structure:</p>
+</div>
+<div class="paragraph">
+<p>_EventId<br>
+Event_description<br>
+…<br>
+parameter<br>
+parameter<br>
+…<br>
+<strong>End</strong></p>
+</div>
+<div class="paragraph">
+<p>EventId is optional. If given, it is placed on the line before the event. It is useful for visualization purposes and for facilitating the correspondence between the error reports and the events where the error is detected.</p>
+</div>
+<div class="paragraph">
+<p>The Event_description gives the type and the name of the event and time information about its occurrence. An event may have zero or more parameters, each on a separate line. The keyword ‘End’ indicates the end of the event description, it must always be present and placed on a new line.</p>
+</div>
+<div class="paragraph">
+<p>The event description has the following format:</p>
+</div>
+<div class="paragraph">
+<p><em>event_type timestamp time_delta source_id source_port target_id target_port interface_name event_name</em></p>
+</div>
+<div class="paragraph">
+<p>Event descriptions are placed on a separate line.</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><em>event_type</em>: one of Command, Signal, Notification, Reply</p>
+</li>
+<li>
+<p><em>timestamp</em>: a representation of the time of the event occurrence. Can be either an epoch time given as a real number or a date-time format: YYYY-MM-DD-HH:MM:SS.MSEC</p>
+</li>
+<li>
+<p><em>time_delta</em> is the time difference between two consecutive events. It is measured in seconds and given as a real number. The first event has time_delta 0.0</p>
+</li>
+<li>
+<p><em>source_id, source_port, target_id, target_port</em> must match a connection declaration. In case of commands and signals, source_id and source_port are the connection’s client_id and client_port; target_id and target_port are the connection’s server_id and server_port. In case of replies and notifications, the situation is reversed</p>
+</li>
+<li>
+<p><em>interface_name</em> and <em>event_name:</em> the name of the event’s interface and the event name. In case of a reply, the name is the name of the command</p>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_parameters"><a class="anchor" href="#_parameters"></a>Parameters</h4>
+<div class="paragraph">
+<p>An event may have zero or more parameters. Commands may have <strong>in</strong>, <strong>inout</strong>, and <strong>out</strong> parameters. A command event gives its <strong>in</strong> and <strong>inout</strong> parameters in the order of their definition in the signature.</p>
+</div>
+<div class="paragraph">
+<p>A reply to a command gives parameters in the following order: <strong>inout</strong> and <strong>out</strong> parameters (if any) in the order of their definition, reply value (if any)</p>
+</div>
+<div class="paragraph">
+<p>Every parameter is given in a separate line and has the following structure:</p>
+</div>
+<div class="paragraph">
+<p><em>type_indicator</em> <em>value</em></p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_type_indicators"><a class="anchor" href="#_type_indicators"></a>Type Indicators</h4>
+<div class="ulist">
+<ul>
+<li>
+<p>Simple types: int, bool, real, string, bulkdata</p>
+</li>
+<li>
+<p>Enum types: enum</p>
+</li>
+<li>
+<p>Record types: record</p>
+</li>
+<li>
+<p>Collection types: vector</p>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_simple_and_enum_values"><a class="anchor" href="#_simple_and_enum_values"></a>Simple and Enum Values</h4>
+<div class="ulist">
+<ul>
+<li>
+<p>Simple types:</p>
+<div class="ulist">
+<ul>
+<li>
+<p>int: 1, 123</p>
+</li>
+<li>
+<p>bool: true, false</p>
+</li>
+<li>
+<p>real: 123.0, NaN</p>
+</li>
+<li>
+<p>string: “some string”</p>
+</li>
+<li>
+<p>bulkdata: the value of a bulkdata is just an integer that indicates the number of bytes in the data. <em>Important:</em> the actual data are not given</p>
+</li>
+</ul>
+</div>
+</li>
+<li>
+<p>Enum types: the name of the type and the literal, e.g. Status OK</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>Some examples:</p>
+</div>
+<div class="paragraph">
+<p><span class="maroon">command</span> 1.0 0.0 Client2 p2 c0 iTempPort ITemperature SetTemperature<br>
+int 80<br>
+<span class="maroon">End</span></p>
+</div>
+<div class="paragraph">
+<p><span class="maroon">Reply</span> 2.005 0.005 c0 iImagPort Client1 p1 IImaging PrepareImage<br>
+enum Result Ok<br>
+<span class="maroon">End</span></p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_record_values"><a class="anchor" href="#_record_values"></a>Record Values</h4>
+<div class="paragraph">
+<p>Record values have the following general structure:</p>
+</div>
+<div class="paragraph">
+<p><em>Record_type_name field_values END</em></p>
+</div>
+<div class="paragraph">
+<p>If the record type is defined in a CommaSuite interface, the name looks like:</p>
+</div>
+<div class="paragraph">
+<p><em>_commaInterface interface_name type_name</em></p>
+</div>
+<div class="paragraph">
+<p>If the record type is defined in a type file the name is just the name of the record type.</p>
+</div>
+<div class="paragraph">
+<p>Field values are enumerated with a space as a delimiter and without giving the field names. Please note that type indicators for field values are not given either.</p>
+</div>
+<div class="paragraph">
+<p>Examples:</p>
+</div>
+<div class="paragraph">
+<p>Record type defined in an interface:</p>
+</div>
+<div class="paragraph">
+<p><span class="maroon">signature</span> ITest<br>
+<span class="maroon">Type</span><br>
+<span class="maroon">enum</span> Status {OK Failed}<br>
+<span class="maroon">record</span> Point {real x, real y}</p>
+</div>
+<div class="paragraph">
+<p>Record value of type <em>Point</em>:</p>
+</div>
+<div class="paragraph">
+<p><span class="maroon">Reply</span> 0.4 0.04 Server ev Client1 p ITest getOnePoint<br>
+record _commaInterface ITest Point 0.0 0.0 END<br>
+<span class="maroon">End</span></p>
+</div>
+<div class="paragraph">
+<p>Nested record type defined in an interface:</p>
+</div>
+<div class="paragraph">
+<p><span class="maroon">record</span> Point {real x, real y}<br>
+<span class="maroon">record</span> Arrow {Point begin, Point end}</p>
+</div>
+<div class="paragraph">
+<p>Record value of type Arrow expressed in CommaSuite expression syntax:</p>
+</div>
+<div class="paragraph">
+<p>Arrow{begin = Point{x = 0.0, y = 0.0}, end = Point{x = 0.0, y = 0.0}}</p>
+</div>
+<div class="paragraph">
+<p>The same record value as a parameter in events file:</p>
+</div>
+<div class="paragraph">
+<p><span class="maroon">Reply</span> 0.4 0.04 Server ev Client1 p ITest getArrow<br>
+record _commaInterface ITest Arrow _commaInterface ITest Point 0.0 0.0 END _commaInterface ITest Point 0.0 0.0 END END<br>
+<span class="maroon">End</span></p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_vector_values"><a class="anchor" href="#_vector_values"></a>Vector Values</h4>
+<div class="paragraph">
+<p>Vector values have the following general structure:</p>
+</div>
+<div class="paragraph">
+<p><em>Base_type_indicator size values END</em></p>
+</div>
+<div class="paragraph">
+<p>Examples:</p>
+</div>
+<div class="paragraph">
+<p>Vector type of records defined in an interface:</p>
+</div>
+<div class="paragraph">
+<p><span class="maroon">record</span> Point {real x, real y}<br>
+<span class="maroon">vector</span> Points = Point []<br></p>
+</div>
+<div class="paragraph">
+<p>Value of type <em>Points</em> expressed in CommaSuite expression syntax:</p>
+</div>
+<div class="paragraph">
+<p>&lt;Points&gt;[Point{x = 1.0, y = 2.1}, Point{x = 2.3, y = 3.2}]</p>
+</div>
+<div class="paragraph">
+<p>The same vector value as a parameter in events file:</p>
+</div>
+<div class="paragraph">
+<p><span class="maroon">Notification</span> 0.2 1.96 Server ev Client1 p ITest activePoints<br>
+vector record 2 _commaInterface ITest Point 1.0 2.1 END _commaInterface ITest Point 2.3 3.2 END END<br>
+<span class="maroon">End</span></p>
+</div>
+<div class="paragraph">
+<p><strong>Important:</strong> please note that maps are not supported as values carried by events. They, however, can be used in the models as variable values.</p>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_issues_with_large_event_files"><a class="anchor" href="#_issues_with_large_event_files"></a>Issues with Large Event Files</h3>
+<div class="paragraph">
+<p>Opening of an event file in the Eclipse IDE will cause parsing of the text and execution of the validation checks.
+If the file is very large (most realistic event files are large) an 'out of memory' exception may occur. Thus we do not recommend inspecting and editing of
+such files in the Eclipse editor.</p>
+</div>
+<div class="paragraph">
+<p>Reading large events files during monitoring (either invoked from the Eclipse IDE or from the command line) is not
+a problem because the monitor reads the file incrementally in order to reduce the used memory.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_appendix"><a class="anchor" href="#_appendix"></a>Appendix</h3>
+<div class="paragraph">
+<p>Grammar of parameters:</p>
+</div>
+<div class="paragraph">
+<p>Parameter ::= TypeIndicator Value</p>
+</div>
+<div class="paragraph">
+<p>TypeIndicator ::= ‘int’ | ‘bool’ | ‘real’ | ‘string’ | ‘bulkdata’ | ‘enum’ | ‘record’ | ‘vector’</p>
+</div>
+<div class="paragraph">
+<p>Value ::= INT_VALUE |<br>
+BOOL_VALUE |<br>
+REAL_VALUE |<br>
+STRING_VALUE |<br>
+EnumValue |<br>
+RecordValue |<br>
+VectorValue</p>
+</div>
+<div class="paragraph">
+<p>EnumValue ::= EnumTypeName EnumLiteral<br>
+EnumTypeName ::= ID<br>
+EnumLiteral ::= ID</p>
+</div>
+<div class="paragraph">
+<p>RecordValue ::= (‘_commaInterface’ InterfaceName)? RecordTypeName Value+ ‘END’<br>
+InterfaceName ::= ID<br>
+RecordTypeName ::= ID</p>
+</div>
+<div class="paragraph">
+<p>VectorValue ::= BaseTypeIndicator Size Value* ‘END’<br>
+BaseTypeIndicator ::= TypeIndicator<br>
+Size ::= NON_NEG_INT</p>
+</div>
+<div class="paragraph">
+<p>The terminals INT_VALUE, BOOL_VALUE, REAL_VALUE, ID and NON_NEG_INT are defined as regular expressions:</p>
+</div>
+<div class="paragraph">
+<p>INT_VALUE ::= (‘-’)? (‘0’..’9’)+</p>
+</div>
+<div class="paragraph">
+<p>BOOL_VALUE ::= ‘true’ | ‘false’</p>
+</div>
+<div class="paragraph">
+<p>REAL_VALUE ::= (INT_NUMBER '.' (‘0’..’9’)+ (('E' | 'e') INT_VALUE)?) | ‘NaN’</p>
+</div>
+<div class="paragraph">
+<p>ID ::= ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*</p>
+</div>
+<div class="paragraph">
+<p>NON_NEG_INT ::= (‘0’..’9’)+</p>
+</div>
+<div class="paragraph">
+<p>STRING_VALUE denotes any sequence of characters surrounded by single or double quotes.</p>
+</div>
+</div>
+</div>
+</div>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/site/favicon.png b/site/favicon.png
new file mode 100644
index 0000000..1361acf
--- /dev/null
+++ b/site/favicon.png
Binary files differ
diff --git a/site/download.html b/site/generators/docgeneration.html
similarity index 79%
copy from site/download.html
copy to site/generators/docgeneration.html
index 1bafd3b..01dc239 100644
--- a/site/download.html
+++ b/site/generators/docgeneration.html
@@ -441,104 +441,63 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="../language/language.html">Language</a><ul class="sectlevel4"><li><a style="" href="../language/types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="../language/states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="../language/components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="font-weight: bold" href="docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../tutorial/intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="../tutorial/preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../tutorial/serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_generation_of_interface_documentation"><a class="anchor" href="#_generation_of_interface_documentation"></a>Generation of Interface Documentation</h2>
 <div class="sectionbody">
+<div class="paragraph normal">
+<p>The generator of interface documentation takes an interface model (.interface file), the relevant interface signature model, a MS Word template as input and generates MS Word document according to the template. The generated document includes descriptions of user-defined types, commands, signals, notifications, state machines, and constraints. The generated documentation also includes the UML diagrams of state machines and constraints.</p>
+</div>
 <div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
+<p>The users need to provide descriptions of interface elements as <em>comments</em> in the models placed before the elements. The following example shows comments for an interface and a command that will be included in the generated document:</p>
 </div>
-<div class="ulist">
-<ul>
-<li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
-</li>
-</ul>
+<div class="literalblock">
+<div class="content">
+<pre>/* The example ICamera interface defines signatures of commands and notifications supported by a digital camera.
+ */
+signature ICamera
+    commands
+
+    /*Turns on the camera. Returns a value of type Status.*/
+    Status PowerOn</pre>
 </div>
-</li>
-<li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
+</div>
+<div class="paragraph">
+<p>The CommaSuite framework provides a predefined template for documenting interfaces.</p>
+</div>
+<div class="paragraph">
+<p>To generate interface documentation, follow the steps below:</p>
+</div>
 <div class="olist arabic">
 <ol class="arabic">
 <li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
+<p>Load the predefined template. Right mouse button click on the project file (.prj) shows a context menu. Select <em>Import Documentation Template</em>.</p>
 </li>
 <li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
+<p>In the project file, define a documentation generation task. The following example shows a documentation generation task for the camera interface:</p>
+<div class="literalblock">
+<div class="content">
+<pre>Generate Documentations {
+    docTask for interface ICamera {
+        template = "Template.docx" //Give the name of the documentation template
+        targetFile = "result.docx" //Give the name of the result file
+        author = "John Smith" //Give the name
+        role = "Designer" //Give the role
+    }
+}</pre>
+</div>
+</div>
 </li>
 <li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
+<p>Execute the generation tasks by choosing <em>Execute CommaSuite Workflow</em> from the context menu. The generated MS Word file is located in the subfolder <em>src-gen/doc</em>.</p>
 </li>
 </ol>
 </div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
-</div>
-<div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
 <div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
-<div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
-<div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
-</li>
-<li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
-</li>
-<li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
-</li>
-<li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
-</div>
+<p>You may need to manually update the table of contents and the size of the pictures.</p>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/generators/generators.html
similarity index 79%
copy from site/download.html
copy to site/generators/generators.html
index 1bafd3b..2ac1a09 100644
--- a/site/download.html
+++ b/site/generators/generators.html
@@ -441,105 +441,64 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="../language/language.html">Language</a><ul class="sectlevel4"><li><a style="" href="../language/types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="../language/states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="../language/components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="font-weight: bold" href="generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../tutorial/intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="../tutorial/preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../tutorial/serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_the_commasuite_generation_tasks"><a class="anchor" href="#_the_commasuite_generation_tasks"></a>The CommaSuite Generation Tasks</h2>
 <div class="sectionbody">
+<div class="paragraph normal">
+<p>The CommaSuite framework performs various generation tasks on CommaSuite models.
+The desired generation tasks are defined in a CommaSuite <em>workflow project</em>, a model with extension .prj. Tasks are grouped per kind and all the tasks of a given kind are given in a single block.</p>
+</div>
 <div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
+<p>The following is an example workflow project for a simple photo camera. Comments in the code explain the meaning of the constructs. The workflow defines a single generation task: generation of interface documentation.</p>
 </div>
-<div class="ulist">
-<ul>
-<li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
-</li>
-</ul>
+<div class="literalblock">
+<div class="content">
+<pre>//Import the models used in generation tasks
+import "Camera.interface"
+
+Project Camera {
+    //Block for all documentation generation tasks
+    Generate Documentations {
+        //task with name docGenTask that generates documentation for ICamera interface
+        docGenTask for interface  ICamera {
+            template = "Template.docx" //Give the name of the documentation template
+            targetFile = "result.docx" //Give the name of the generated file
+            author = "John Smith" //Give the name
+            role = "R&amp;D: SW Designer" //Give the role
+        }
+    }
+}</pre>
 </div>
-</li>
-<li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
+</div>
+<div class="paragraph">
+<p><strong>CommaSuite workflow</strong></p>
+</div>
+<div class="paragraph">
+<p>In order to create a CommaSuite workflow project and to execute the defined generation tasks, follow the steps:</p>
+</div>
 <div class="olist arabic">
 <ol class="arabic">
 <li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
+<p>In the Eclipse project that contains your models, create a new file with extension <em>.prj</em>.</p>
 </li>
 <li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
+<p>In the created project file, import the required models.</p>
 </li>
 <li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
+<p>Define the desired generation blocks and tasks. Consult the relevant help pages on the details of the supported generation tasks.</p>
 </li>
 <li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
+<p>Once the generation tasks are defined, they can be executed. Right mouse click on the .prj file shows a context menu. Select <em>Execute CommaSuite Workflow</em>. Alternatively, use the shortcut "Ctrl+B".</p>
 </li>
 <li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
+<p>Once the generation is finished, the generated files are placed in the sub-folder <em>src-gen</em>. If errors are encountered, a message is conveyed with the location of the error report file.</p>
 </li>
 </ol>
 </div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
-</div>
-<div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
-<div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
-<div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
-<div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
-</li>
-<li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
-</li>
-<li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
-</li>
-<li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
-</div>
-</div>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/generators/monitoring.html
similarity index 60%
copy from site/download.html
copy to site/generators/monitoring.html
index 1bafd3b..e86b61b 100644
--- a/site/download.html
+++ b/site/generators/monitoring.html
@@ -441,103 +441,310 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="../language/language.html">Language</a><ul class="sectlevel4"><li><a style="" href="../language/types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="../language/states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="../language/components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="font-weight: bold" href="monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../tutorial/intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="../tutorial/preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../tutorial/serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_monitoring"><a class="anchor" href="#_monitoring"></a>Monitoring</h2>
 <div class="sectionbody">
+<div class="paragraph normal">
+<p>Monitoring is a process of checking if the observed behavior of a component conforms to a behavioral specification. Behavioral specifications can be interface models and component models. In case of interface model the process is interface monitoring: a check if the behavior of a component that provides the interface conforms to the interface definition. In case of component model the process is component monitoring: a check if the behavior of a component conforms to the functional, time and data constraints in the model.</p>
+</div>
 <div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
+<p>To perform monitoring with the CommaSuite framework, the following ingredients are required:</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
+<p>Behavioral model (.interface or .component file). The model in turn imports interface and signature definitions.</p>
 </li>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
+<p>One or more trace files with events (calls to commands and signals, notifications and replies to commands) observed during a component execution. Traces are stored in files with extension .events. It is not recommended to create such files manually. They are usually obtained via network sniffing or from execution logs. Trace file names have to start with a letter and have to contain only letters, digits and underscore ("_").</p>
 </li>
 </ul>
 </div>
-</li>
-<li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
+<div class="paragraph">
+<p>In order to perform monitoring, follow the steps:</p>
+</div>
 <div class="olist arabic">
 <ol class="arabic">
 <li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
+<p>Include one or more tasks for monitor generation in the CommaSuite project file. A monitoring task has to specify how the trace files are obtained. Trace files can be listed, a folder with trace files can be given, or they can be produced by another generation task. Furthermore, the task has to indicate the behavioral model (interface or component). In the example below a single file with traces is used (TraceITest.events) for interface monitoring:</p>
+<div class="literalblock">
+<div class="content">
+<pre>Generate Monitors {
+    iTestMonitor for interface ITest {
+        trace files
+        "TraceITest.events"
+    }
+}</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>The following example shows a task that uses a directory (named trace_files) with traces for component monitoring:</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>Generate Monitors {
+    monitorTask for component Imaging {
+        trace directories
+        "trace_files"
+    }
+}</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>If the trace files are produced by another task then refer to the task:</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>Generate Monitors {
+    iTestMonitor for interface ITest {
+        trace files
+        task traceProducer
+    }
+}</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Trace directories have to contain trace files with unique names. If two directories contain distinct files with the same name an error will be indicated.</p>
+</div>
+<div class="paragraph">
+<p>During monitoring all time and data constraints defined in the interface or component are checked over the traces. In some cases users may need to skip the check of time and data constraints due to various reasons, for example when the real hardware is not present yet thus making the execution environment different than the expected one. Constraint checks can be skipped by including one of the instructions <em>skip time constraints, skip data constraints, skip constraints</em>. The following example monitoring task skips both time and data constraints:</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>Generate Monitors {
+    iTestMonitor for interface ITest {
+        skip constraints
+
+        trace files
+        task traceProducer
+    }
+}</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>In case of component monitoring, interface monitoring is performed as well for the interfaces on each component port. Every event used in a component instance is first checked by the corresponding interface monitor and after that passed to the component monitor. The component monitor checks if functional, data and time constraints are satisfied.</p>
+</div>
 </li>
 <li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
+<p>Generate the monitoring code and execute it. After a right mouse button click on the project file, select 'Run As'. Select the first item: "CommaSuite Generation and Monitoring". As a result, all generator tasks will be executed followed by execution of all the monitoring tasks. Results are located in the folder "comma-gen" (explained further on this page).</p>
 </li>
 </ol>
 </div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
-</div>
 <div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
+<h3 id="_inspecting_the_results_of_monitoring"><a class="anchor" href="#_inspecting_the_results_of_monitoring"></a>Inspecting the Results of Monitoring</h3>
 <div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
+<p>Monitoring results unite the results from all traces in all monitoring tasks in the given project file.</p>
 </div>
-</div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
 <div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
-<div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
+<p>For a given trace:</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
+<p>in case of interface monitoring, all connections in the trace over the given interface are monitored</p>
 </li>
 <li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
+<p>in case of component monitoring, all instances of the given component model are monitored</p>
 </li>
 <li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
-</li>
-<li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
+<p>if trace error occurs (this is a syntax error in the events file) all monitoring stops and the results obtained so far are reported along with the trace error</p>
 </li>
 </ul>
 </div>
 <div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
+<p>For interface monitoring, we may observe:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>interface error: a violation of the behavior given in interface state machines. Monitoring of the corresponding connection stops</p>
+</li>
+<li>
+<p>interface warning: a violation of interface time/data/generic constraints. Monitoring of the connection continues</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>For component monitoring, we may observe:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>component error: a violation of a functional component constraint. Monitoring of this constraint stops</p>
+</li>
+<li>
+<p>component warning: a violation of a component time/data/generic constraint. Monitoring of the component instance continues</p>
+</li>
+<li>
+<p>port error: interface error in a connection to a component port. Monitoring of functional and time/data constraints for the corresponding instance stops.
+Interface monitoring of the remaining port connections continues</p>
+</li>
+<li>
+<p>port warning: interface warning in a connection to a component port. Monitoring of the component instance continues</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>In order to inspect the monitoring results:</p>
+</div>
+<div class="olist arabic">
+<ol class="arabic">
+<li>
+<p>Navigate to folder <em>comma-gen</em>. For every monitoring task, a folder with the name of the task is created. A summary of the results from all tasks is stored in JSON format in file <em>tasksResults.json</em>. Furthermore, a web page <em>dashboard.html</em> is automatically created. It contains an overview of the results per trace. If you want more detailed information about the results continue to step 2. Every task results folder has the following structure:</p>
+<div class="ulist">
+<ul>
+<li>
+<p>One folder for each trace file, named after the file name</p>
+</li>
+<li>
+<p>Folder <em>statistics</em> that contains information about the checking of the time and data constraints (if any)
+<br>
+<span class="image"><img src="../img/executionResult.jpg" alt="image"></span></p>
+</li>
+</ul>
+</div>
+</li>
+<li>
+<p>Inspect the results for a particular trace file by opening the corresponding folder. Results are structured differently for interface and component monitoring.</p>
+<div class="ulist">
+<ul>
+<li>
+<p><em>Interface monitoring</em>.
+For every connection
+(usage of an interface by a unique pair of client and server)
+there will be a folder with name $ServerName$_$ClientName$_$Interface$.
+The folder has at least two files: $ServerName$_$ClientName$_$Interface$_trace.txt that contains the processed trace and $ServerName$_$ClientName$_$Interface$_results.txt that contains a summary of the monitoring results for the connection.
+If errors and warnings are detected they will result in additional files.</p>
+<div class="paragraph">
+<p><span class="image"><img src="../img/error.jpg" alt="image"></span><br>
+In case of detected issues, they are described by giving the context and their exact nature. Errors and warnings are also described in separate files that can be visualized in the PlantUML view.</p>
+</div>
+<div class="paragraph">
+<p>Visualize the content of .plantuml files (if any) in the PlantUML view to check the description of the error/warning.
+The issue is reported in a UML sequence diagram that gives the path to the error and a description.<br>
+<span class="image"><img src="../img/errorPlantUML.png" alt="image"></span><br></p>
+</div>
+</li>
+<li>
+<p><em>Component monitoring</em>.
+For every component instance in the given trace file there will be a folder named after the component instance.
+Each such folder further contains one folder per component port (named after the port), one folder per functional constraint (named after the constraint), and one folder named <em>time_data</em> that contains the results of checking the time and data constraints in the component model (if any).
+The folders derived from the ports contain the results of the interface monitoring on the given port.
+The results in all the folders are structured similarly to the case of interface monitoring: one text file with a summary of the results, one text file with the processed trace (up to the occurrence of an error if any), and possibly many files with error/warning descriptions.</p>
+</li>
+</ul>
+</div>
+</li>
+</ol>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_interface_monitoring_and_non_determinism"><a class="anchor" href="#_interface_monitoring_and_non_determinism"></a>Interface Monitoring and Non-Determinism</h3>
+<div class="paragraph">
+<p>Interface specifications support non-determinism by allowing multiple ways to react to a given trigger (check the interface language and the "OR" clause in particular). The presence of non-determinism affects how monitoring is performed and how monitoring results are reported.</p>
+</div>
+<div class="paragraph">
+<p>In general, when a non-determinism is detected during monitoring, the monitor will maintain and explore all execution paths. As more events from the trace are checked by the monitor, some execution paths may be identified as erroneous and therefore discarded. If all paths at a given moment do not allow the occurrence of an event then a monitoring error is reported and contextual information for all the paths will be shown.</p>
+</div>
+<div class="paragraph">
+<p>We give an example of monitoring error in case of non-determinism and explain the structure of the reported results.</p>
+</div>
+<div class="paragraph">
+<p>Imagine the interface of a simple vending machine that accepts coins and delivers products on user request. When a coin is inserted, the machine checks first if this is a valid coin and then reports the outcome to the user together with the value of possibly updated credit. If the machine is in error state then the coin is simply returned. The code snippet shows only the transition when a coin is inserted:</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>initial state NoCredit {
+    transition trigger: InsertCoin(int val)
+            do: credit := credit + 1
+            reply(credit,CoinResult::ACCEPTED)
+            next state: CreditAvailable
+        OR
+            do:
+            reply(credit,CoinResult::NOT_ACCEPTED)
+            next state: NoCredit
+        OR
+            do:
+            reply(0,CoinResult::NOT_OPERATIONAL)
+            next state: NoCredit
+    ....
+}</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>After inserting the coin, the transition gives three possible paths. This is an example of non-determinism. By reading the observed reply in the trace, the monitoring algorithm can determine which path to take or possibly an error is detected. Consider the following trace:</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>Command InsertCoin
+Reply to command InsertCoin. Parameters: -1 CoinResult::NOT_OPERATIONAL</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>The trace will cause an error because the reply parameters do not match any of the expected values given in the three possible transition bodies. All the three possible executions at the moment of observing the reply will be reported in the monitoring results.</p>
+</div>
+<div class="paragraph">
+<p>The text file with the results will contain the following:</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>Interface monitoring error
+The event does not conform to the model
+
+Possible events in the current state of the model:
+
+Reply to command InsertCoin. Parameters: 1 CoinResult::ACCEPTED
+Reply to command InsertCoin. Parameters: 0 CoinResult::NOT_ACCEPTED
+Reply to command InsertCoin. Parameters: 0 CoinResult::NOT_OPERATIONAL
+
+Execution states of the model:
+
+Active state: NoCredit
+Values of global variables and current machine states:
+
+credit = 0
+Machine userMachine in state NoCredit
+
+Active state: NoCredit
+Values of global variables and current machine states:
+
+credit = 0
+Machine userMachine in state NoCredit
+
+Active state: NoCredit
+Values of global variables and current machine states:
+
+credit = 0
+Machine userMachine in state NoCredit</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>As can be seen there is a description for each possible execution. It contains: the state in which the event is observed (active state), the values of interface variables, the current states of the interface state machines (recall that multiple machines are possible). In our example, it happens that all executions have the same information.</p>
+</div>
+<div class="paragraph">
+<p>The visualization of the error as a sequence diagram will contain similar information:</p>
+</div>
+<div class="paragraph">
+<p><span class="image"><img src="../img/MonitorErrorAndNonDeterminism.png" alt="image"></span></p>
+</div>
+<div class="paragraph">
+<p>The three sections in the note indicate the three possible executions at the moment of observing the reply. In this example they are identical.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_singleton_and_multiton_interface_monitoring"><a class="anchor" href="#_singleton_and_multiton_interface_monitoring"></a><span id="singleton_multiton_monitoring">Singleton and Multiton Interface Monitoring</span></h3>
+<div class="paragraph">
+<p>The singleton/multiton distinction of an interface determines how the interface is monitored. Generally, a trace file contains information about servers that provide interfaces and clients that use them. A single server may have multiple clients of a given interface. A triplet of a client that uses an interface provided by a server is called <em>connection</em>.</p>
+</div>
+<div class="paragraph">
+<p>A multiton interface is monitored by creating a separate monitor for every connection over that interface.</p>
+</div>
+<div class="paragraph">
+<p>A singleton interface is monitored by creating a single monitor for all the connections that have the same server at their end. This reflects the fact that the clients of a singleton interface share one instance. In other words, the monitor of a singleton interface does not distinguish its clients, it treats them as a single client.</p>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/generators/reachabilitygraph.html
similarity index 64%
copy from site/download.html
copy to site/generators/reachabilitygraph.html
index 1bafd3b..9e169e6 100644
--- a/site/download.html
+++ b/site/generators/reachabilitygraph.html
@@ -441,103 +441,314 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="../language/language.html">Language</a><ul class="sectlevel4"><li><a style="" href="../language/types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="../language/states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="../language/components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="font-weight: bold" href="reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../tutorial/intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="../tutorial/preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../tutorial/serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_reachability_graph"><a class="anchor" href="#_reachability_graph"></a>Reachability graph</h2>
 <div class="sectionbody">
+<div class="paragraph normal">
+<p>The reachability graph contains all the possible states (nodes) and transitions (edges) of a CommaSuite model.
+To generate a reachability graph add the following to the <code>.prj</code> file, e.g. using content assist (ctrl + space):</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code>import "Camera.interface"
+
+Project Camera {
+  Generate ReachabilityGraph {
+    // ReachabilityGraph_ICamera is the name of the job (can be anything).
+    ReachabilityGraph_ICamera for interface ICamera
+    {
+        // The traversal of the generator is limited by "max-depth"
+        max-depth: 30
+        // In case any of the triggers in the interface has parameters,
+        // values for these variables have to be defined in the ".params" file.
+        // Consult the Parameters section below for more information.
+        // This file is not required when none of the triggers have parameters.
+        params: "Camera.params"
+    }
+	}
+}</code></pre>
+</div>
+</div>
 <div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
+<p>To generate the reachability graph, run the <code>.prj</code> (right click on the <code>.prj</code> file &#8594; Execute CommaSuite Workflow).
+In the above example, the output can be found under <code>src-gen/reachabilityGraph.ICamera</code>.
+This folder will contain the reachability graph (<code>reachability_graph.json</code>).</p>
+</div>
+<div class="sect2">
+<h3 id="_reachability_graph_json"><a class="anchor" href="#_reachability_graph_json"></a>Reachability graph JSON</h3>
+<div class="paragraph">
+<p>The <code>reachability_graph.json</code> represents a graph and follows the <a href="https://github.com/jsongraph/json-graph-specification">json-graph-specification</a>.
+An example:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-json" data-lang="json">{
+  "graph": {
+    // Contains some metadata of this reachability graph
+    "metadata": {
+      // The initial node (starting point)
+      "initial": "Off_2_2",
+      // The reached depth, will never be larger than the max depth
+      "depth": 16,
+      // The max depth, this is to prevent an endless loop, can be configure in the .prj file.
+      "max-depth": 30,
+      // The total amount of states in the CommaSuite model (interface/component)
+      "total-states": 3,
+      // The amount of states that have been covered by this reachability graph
+      "covered-states": 3,
+      // The total amount of clauses in the CommaSuite model (interface/component)
+      "total-clauses": 9,
+      // The amount of clauses that have been covered by this reachability graph
+      "covered-clauses": 9
+    },
+    // Nodes represent all the possible states
+    "nodes": {
+      // 'Off_2_2' is the unique ID of this node
+      "Off_2_2": {
+        // The state of this node (matches the states found in the CommaSuite model)
+        "state": "Off"
+      },
+      "PoweredOn_2_2": {
+        "state": "PoweredOn"
+      },
+      "Off_2_2_Triggered_PowerOn": {
+        "state": "Off",
+        // Intermediate nodes have a trigger (in this case the command PowerOn())
+        "trigger": "PowerOn"
+      },
+      ...
+    },
+    // Edges represent all the possible transitions
+    "edges": [
+      {
+        // Source/target refer to nodes of this transition
+        "source": "Off_2_2",
+        "target": "Off_2_2_Triggered_PowerOn",
+        // Entries is a list of events that are required to reach the next state (target).
+        // To reach the Off_2_2_Triggered_PowerOn state the command PowerOn() has to be executed.
+        "entries": [
+          {
+            "method": "PowerOn",
+            "type": "void",
+            // Arguments of this command
+            "arguments": [
+                {"direction": "in", "type": "int", "value": 5},
+                {"direction": "out", "type": "int", "value": 0},
+            ],
+            "kind": "Command"
+          }
+        ]
+      },
+      {
+        "source": "Off_2_2_Triggered_PowerOn",
+        "target": "PoweredOn_2_2",
+        "entries": [
+          {
+            "method": "PowerOn",
+            "order": 0,
+            "arguments": [
+                {"direction": "out", "type": "int", "value": 20}
+            ],
+            "kind": "Reply",
+            "return_value": {"type": "int", "value": 6}
+          }
+        ]
+      },
+      ...
+    ]
+  }
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>In the above example there are 3 possible states.
+The initial state is <code>Off_2_2</code>, from this we can transition to <code>Off_2_2_Triggered_PowerOn</code> by the command <code>PowerOn(5)</code>.
+Next we can transition to the <code>PoweredOn_2_2</code> state by the reply to the <code>PowerOn()</code> command with the output parameter being <code>20</code> and the return value being <code>6</code>.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_parameters"><a class="anchor" href="#_parameters"></a>Parameters</h3>
+<div class="paragraph">
+<p>If any of the triggers in the CommaSuite model require parameters,
+values for these parameters have to be provided through a <code>.params</code> file.
+Next to the <code>.interface</code> file, create a file called <code>INTERFACE_NAME.params</code>.
+Start the file by importing the interface (e.g. <code>import Camera.interface</code>),
+then open the content assist (ctrl + space) and
+select "Autocomplete missing triggers".
+Next fill in the desired parameters and the <code>.params</code> file is complete.
+An example of a <code>.params</code> file:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-json" data-lang="json">// The interface we want to provide parameters for
+import "Camera.interface"
+
+// The trigger (command or signal)
+trigger: SetZoom
+// The state we are providing parameters for
+state: PoweredOn
+// The provided parameters, note that multiple parameters sets can be provided
+params: ( 3, 9 )
+params: ( 11, 5 )
+// Next to SetZoom in the PoweredOn state, we also provided parameters for SetZoom in the PoweredOff state.
+state: PoweredOff
+params: ( 21, 5 )
+
+trigger: GetCapacity
+state: PoweredOn
+params: ( CapacityType::Total )
+params: ( CapacityType::Remaining )</code></pre>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_deterministic_scenarios_json"><a class="anchor" href="#_deterministic_scenarios_json"></a>Deterministic scenarios JSON</h3>
+<div class="paragraph">
+<p>The <code>deterministic_scenarios.json</code> file contains all possible deterministic scenarios that can be generated from the reachability graph. This can be used for e.g. test generation. These scenarios cover all possible paths through the reachability graph and stop when a loop is detected. Example:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-json" data-lang="json">{
+  "scenarios": [
+    [
+      // Scenario 1
+      {
+        "method": "PowerOn",
+        "type": "void",
+        "arguments": [],
+        "kind": "Command"
+      },
+      {
+        "method": "PowerOn",
+        "order": 0,
+        "arguments": [],
+        "kind": "Reply"
+      },
+      ...
+    ],
+    [
+      // Scenario 2
+      {
+        "method": "PowerOn",
+        "type": "void",
+        "arguments": [],
+        "kind": "Command"
+      },
+      {
+        "method": "PowerOn",
+        "order": 0,
+        "arguments": [],
+        "kind": "Reply"
+      },
+      {
+        "method": "TakePicture",
+        "type": "Status",
+        "arguments": [],
+        "kind": "Command"
+      },
+      ...
+    ]
+  ]
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>The JSON contains a property callled <code>scenarios</code> which is a list of lists. Each list represents a scenario and each entry of the scenario represents an action. These actions have the same format as the actions in <code>entries</code> of the <code>reachability_graph.json</code>.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_example"><a class="anchor" href="#_example"></a>Example</h3>
+<div class="paragraph">
+<p>An example of the reachability graph generation is included in CommaSuite.
+It can be imported by clicking File (left-top) &#8594; New &#8594; Example &#8594; Test Generation Example &#8594; Next &#8594; Finish.
+The <code>Camera.prj</code> file contains the reachability graph generator.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_debug"><a class="anchor" href="#_debug"></a>Debug</h3>
+<div class="paragraph">
+<p>To get more insight in how the reachablity graph was build,
+the debug option can be enabled.
+This can be done by providing the <code>debug</code> flag. For instance:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code>Generate ReachabilityGraph {
+    ReachabilityGraph_ICamera for interface ICamera
+    {
+        max-depth: 30
+        params: "Camera.params"
+        debug  // &lt;-- Add this
+    }
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>After running the generator there will be 3 more files next to the <code>reachability_graph.json</code>:</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
+<p><code>builder.txt</code>: This file shows how the CommaSuite model was traversed. An explanation can be found at the top of the file.</p>
 </li>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
+<p><code>reachability_graph.html</code>: This file contains a visual representation of the reachability graph.</p>
 </li>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
+<p><code>deterministic_scenarios.txt</code>: This file shows all possible deterministic scenarios (used for test generation) that can be generated from the reachability graph. These scenarios cover all possible paths through the reachability graph and stop when a loop is detected.</p>
 </li>
 </ul>
 </div>
-</li>
-<li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
-</li>
-<li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
-</li>
-</ol>
-</div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
 </div>
 <div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
+<h3 id="_component"><a class="anchor" href="#_component"></a>Component</h3>
 <div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
+<p>The reachability graph generator also supports components. Note that the reachability graph will only contain the <code>provided port</code>. All <code>required port</code> and all constraints that refer to a <code>required port</code> are skipped. Example:</p>
 </div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code>Generate ReachabilityGraph {
+    // Instead of "for interace" use "for component".
+    ReachabilityGraph_MyComponent for component MyComponent
+    {
+        max-depth: 30
+        // For each interface having triggers with parameters, a .params file has to be provided.
+        params: "Interface1.params" "Interface2.params"
+    }
+}</code></pre>
 </div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
-<div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
-<div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
-</li>
-<li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
-</li>
-<li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
-</li>
-<li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
-</li>
-</ul>
 </div>
 <div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
+<p>The <code>entries</code> in the <code>reachability_graph.json</code> will include 2 additional attributes: <code>port</code> and <code>connection</code>. An example:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code>{
+    "graph": {
+        "edges": [
+            {
+                "entries": [{
+                    "arguments": [],
+                    // Connnection of this command
+                    "connection": "id1",
+                    "kind": "Command",
+                    "method": "Start",
+                    // Port of this command
+                    "port": "temperaturePort",
+                    "type": "void"
+                }],
+                "source": "imagePort_id1_NotImaging__temperaturePort_id1_Stopped",
+                "target": "imagePort_id1_NotImaging__temperaturePort_id1_Stopped_Triggered_Start"
+            },
+        ],
+        ...
+    }
+}</code></pre>
+</div>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/generators/testgeneration.html
similarity index 72%
copy from site/download.html
copy to site/generators/testgeneration.html
index 1bafd3b..a48c353 100644
--- a/site/download.html
+++ b/site/generators/testgeneration.html
@@ -441,103 +441,171 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="../language/language.html">Language</a><ul class="sectlevel4"><li><a style="" href="../language/types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="../language/states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="../language/components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="font-weight: bold" href="testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../tutorial/intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="../tutorial/preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../tutorial/serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_test_generation"><a class="anchor" href="#_test_generation"></a>Test generation</h2>
 <div class="sectionbody">
+<div class="paragraph normal">
+<p>The test generator allows to generate testcases from a CommaSuite model by using the reachability graph.
+Currently Java (JUnit) test generation is supported.
+To enable test generation add the following to the <code>.prj</code> file, e.g. using content assist (ctrl + space):</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code>import "Camera.interface"
+
+Project Camera {
+  // Generate the reachability graph, see the reachability graph documentation.
+  Generate ReachabilityGraph {
+      ReachabilityGraph_ICamera for interface ICamera
+      {
+          max-depth: 30
+          params: 'Camera.params'
+          debug
+      }
+  }
+
+  // Test generation
+  Generate Test {
+      // Test_IRetroCamera is the name of this task (can be anything).
+      // ReachabilityGraph_ICamera refers to the reachability graph task above.
+      Test_IRetroCamera for task ReachabilityGraph_ICamera {
+          // Enables the Java test generator.
+          java: {}
+      }
+  }
+}</code></pre>
+</div>
+</div>
 <div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
+<p>To generate the tests, run the <code>.prj</code> (right click on the <code>.prj</code> file &#8594; Execute CommaSuite Workflow).
+The output can be found in the <code>src-gen</code> directory.</p>
+</div>
+<div class="sect2">
+<h3 id="_java_test_generator"><a class="anchor" href="#_java_test_generator"></a>Java test generator</h3>
+<div class="paragraph">
+<p>The Java test generator generates test cases based on JUnit.
+An example is included in CommaSuite and can be imported by clicking File (left-top) &#8594; New &#8594; Example &#8594; <em>Test Generation Example</em> &#8594; Next &#8594; Finish.
+Running the generator (right click on the <code>.prj</code> file &#8594; Execute CommaSuite Workflow) will generate the test cases under <code>src-gen/test.interfaceCamera/TestCases.java</code> (which can be executed by right click on <code>TestCases.java</code> &#8594; Run As &#8594; JUnit Test):</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code class="language-java" data-lang="java">package test.ICamera;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Assertions;
+
+@SuppressWarnings("unused")
+public class TestCases {
+    private static final Adapter adapter = new Adapter();
+
+    @BeforeAll
+    public static void beforeAll() {
+        adapter.beforeAll();
+    }
+
+    @BeforeEach
+    public void beforeEach() {
+        adapter.beforeEach();
+    }
+
+    @AfterEach
+    public void afterEach() {
+        adapter.afterEach();
+    }
+
+    @AfterAll
+    public static void afterAll() {
+        adapter.afterAll();
+    }
+
+    @Test
+    public void testScenario1() throws InterruptedException {
+        /*
+         * Call command PowerOn()
+         *
+         * When calling command TakePicture() we should get:
+         * - Return value: Ok
+         *
+         * Call command PowerOff()
+         *
+         * Call command PowerOn()
+         *
+         * When calling command TakePicture() we should get:
+         * - Return value: Ok
+         *
+         * Call command PowerOff()
+         *
+         * Call command PowerOn()
+         *
+         * When calling command TakePicture() we should get:
+         * - Return value: OutOfSpace
+         *
+         * When calling command SetZoom(3) we should get:
+         * - Notification ZoomChanged with value 3
+         * - Return value: Ok
+         */
+
+        var result0 = adapter.call("PowerOn", null);
+
+        var result2 = adapter.call("TakePicture", "Ok");
+        Assertions.assertEquals("Ok", result2.returnValue);
+
+        var result4 = adapter.call("PowerOff", null);
+
+        var result6 = adapter.call("PowerOn", null);
+
+        var result8 = adapter.call("TakePicture", "Ok");
+        Assertions.assertEquals("Ok", result8.returnValue);
+
+        var result10 = adapter.call("PowerOff", null);
+
+        var result12 = adapter.call("PowerOn", null);
+
+        var result14 = adapter.call("TakePicture", "OutOfSpace");
+        Assertions.assertEquals("OutOfSpace", result14.returnValue);
+
+        var result16 = adapter.call("SetZoom", "Ok", 3);
+        var result17 = adapter.waitForNotification("ZoomChanged", 3);
+        Assertions.assertTrue(result17);
+        Assertions.assertEquals("Ok", result16.returnValue);
+    }
+
+    ...
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>The <code>adapter</code> is reponsible for doing the communication with the system under test (SUT). The <code>(before|after)(All|Each)</code> methods allow the adapter to do any setup/teardown of the SUT.</p>
+</div>
+<div class="paragraph">
+<p>The <code>testScenario*</code> methods contain the test cases. Each test case starts with a human readable description followed by the test code. As can be seen above, methods are called and the return value (if any) is checked. Also any expected notifications are checked.</p>
+</div>
+<div class="paragraph">
+<p>The adapter code contains system specific logic and is therefore manually written. The example can be found under <code>src/test.interfaceCamera/Adapter.java</code>. This adapter contains:</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
+<p>Classes to handle and check events generated by the SUT (<code>AutoResetEvent</code>, <code>Event</code>, <code>EventHandler</code>)</p>
 </li>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
+<p>The <code>call</code> method to execute a command/signal on the SUT with a given set of parameters.</p>
 </li>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
-</li>
-</ul>
-</div>
-</li>
-<li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
-</li>
-<li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
-</li>
-</ol>
-</div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
-</div>
-<div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
-<div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
-<div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
-<div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
-</li>
-<li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
-</li>
-<li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
-</li>
-<li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
+<p>Before and after each call the <code>beforeEvent</code> and <code>afterEvent</code> methods are called. These method can be used to trigger any non-standard behaviour on the interface (e.g. an error situation which would normally not occur).</p>
 </li>
 </ul>
 </div>
 <div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
+<p>The <em>Test Generation Example</em> also contains an example for components. The testcases can be found under <code>src-gen/test.componentCamera/TestCases.java</code>.</p>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/generators/umlgeneration.html
similarity index 81%
copy from site/download.html
copy to site/generators/umlgeneration.html
index 1bafd3b..16ced0a 100644
--- a/site/download.html
+++ b/site/generators/umlgeneration.html
@@ -441,104 +441,37 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="../language/language.html">Language</a><ul class="sectlevel4"><li><a style="" href="../language/types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="../language/states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="../language/components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="font-weight: bold" href="umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../tutorial/intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="../tutorial/preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../tutorial/serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_generation_of_uml_pictures"><a class="anchor" href="#_generation_of_uml_pictures"></a>Generation of UML Pictures</h2>
 <div class="sectionbody">
-<div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
-</li>
-</ul>
-</div>
-</li>
-<li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
-</li>
-<li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
-</li>
-</ol>
-</div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
-</div>
-<div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
-<div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
-<div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
-<div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
-</li>
-<li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
-</li>
-<li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
-</li>
-<li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
-</li>
-</ul>
+<div class="paragraph normal">
+<p>The CommaSuite framework supports the generation of UML images from CommaSuite interface models. Output is generated in two formats: plantUML and PNG format. The generation of UML images needs to be defined in the CommaSuite project (.prj.) as a Generate UML Task.</p>
 </div>
 <div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
+<p>The following example project contains a simple UML Task. The task has an imported Interface model as input. Comments in the code explain the meaning of the constructs.</p>
 </div>
+<div class="literalblock">
+<div class="content">
+<pre>import "ICamera.interface"
+
+Project Camera {
+
+    //Block for all UML generation tasks
+    Generate UML {
+
+        //task with name umlTask that generates UML images
+        //from the provided interface ICamera
+        umlTask for interface ICamera
+    }
+}</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>The task will first generate plantuml files which will then be used for the generation of the PNG images. These plantuml files contain a textual representation and can be seen as a diagram using the PlantUml viewer in Eclipse. To open the viewer go to, Window &#8594; Show View &#8594; PlantUml &#8594; PlantUml. The task also generates a .graphml file. The generated files are located in folder <code>src-gen/uml/umlTask</code>  under the root folder of the project.</p>
 </div>
 </div>
 </div>
diff --git a/site/img/ComMAProjectWizard.png b/site/img/ComMAProjectWizard.png
new file mode 100644
index 0000000..b6c31c0
--- /dev/null
+++ b/site/img/ComMAProjectWizard.png
Binary files differ
diff --git a/site/img/CommaOverview-old.png b/site/img/CommaOverview-old.png
new file mode 100644
index 0000000..0f78dd8
--- /dev/null
+++ b/site/img/CommaOverview-old.png
Binary files differ
diff --git a/site/img/CommaOverview.png b/site/img/CommaOverview.png
new file mode 100644
index 0000000..6bcc2a0
--- /dev/null
+++ b/site/img/CommaOverview.png
Binary files differ
diff --git a/site/img/CommaProjectWizard.png b/site/img/CommaProjectWizard.png
new file mode 100644
index 0000000..b6c31c0
--- /dev/null
+++ b/site/img/CommaProjectWizard.png
Binary files differ
diff --git a/site/img/IImaging.png b/site/img/IImaging.png
new file mode 100644
index 0000000..f48b1e3
--- /dev/null
+++ b/site/img/IImaging.png
Binary files differ
diff --git a/site/img/ITemperature.png b/site/img/ITemperature.png
new file mode 100644
index 0000000..29926e9
--- /dev/null
+++ b/site/img/ITemperature.png
Binary files differ
diff --git a/site/img/IVacuum.png b/site/img/IVacuum.png
new file mode 100644
index 0000000..06224a8
--- /dev/null
+++ b/site/img/IVacuum.png
Binary files differ
diff --git a/site/img/MonitorErrorAndNonDeterminism.png b/site/img/MonitorErrorAndNonDeterminism.png
new file mode 100644
index 0000000..6f06043
--- /dev/null
+++ b/site/img/MonitorErrorAndNonDeterminism.png
Binary files differ
diff --git a/site/img/QuickFix.png b/site/img/QuickFix.png
new file mode 100644
index 0000000..4c79e00
--- /dev/null
+++ b/site/img/QuickFix.png
Binary files differ
diff --git a/site/img/RunMonitoring.jpg b/site/img/RunMonitoring.jpg
new file mode 100644
index 0000000..e26e891
--- /dev/null
+++ b/site/img/RunMonitoring.jpg
Binary files differ
diff --git a/site/img/Scenario_Generation.png b/site/img/Scenario_Generation.png
new file mode 100644
index 0000000..373a868
--- /dev/null
+++ b/site/img/Scenario_Generation.png
Binary files differ
diff --git a/site/img/Stubs_and_Simulation.png b/site/img/Stubs_and_Simulation.png
new file mode 100644
index 0000000..7be8440
--- /dev/null
+++ b/site/img/Stubs_and_Simulation.png
Binary files differ
diff --git a/site/img/Templates.png b/site/img/Templates.png
new file mode 100644
index 0000000..c75c944
--- /dev/null
+++ b/site/img/Templates.png
Binary files differ
diff --git a/site/img/banner.png b/site/img/banner.png
new file mode 100644
index 0000000..a4288d9
--- /dev/null
+++ b/site/img/banner.png
Binary files differ
diff --git a/site/img/docgenexample.jpg b/site/img/docgenexample.jpg
new file mode 100644
index 0000000..d4f1024
--- /dev/null
+++ b/site/img/docgenexample.jpg
Binary files differ
diff --git a/site/img/docgenprojectcontent.jpg b/site/img/docgenprojectcontent.jpg
new file mode 100644
index 0000000..720cc53
--- /dev/null
+++ b/site/img/docgenprojectcontent.jpg
Binary files differ
diff --git a/site/img/docgenresult.jpg b/site/img/docgenresult.jpg
new file mode 100644
index 0000000..a138e34
--- /dev/null
+++ b/site/img/docgenresult.jpg
Binary files differ
diff --git a/site/img/eclipse-incubation.png b/site/img/eclipse-incubation.png
new file mode 100644
index 0000000..5fccef5
--- /dev/null
+++ b/site/img/eclipse-incubation.png
Binary files differ
diff --git a/site/img/error.jpg b/site/img/error.jpg
new file mode 100644
index 0000000..126a674
--- /dev/null
+++ b/site/img/error.jpg
Binary files differ
diff --git a/site/img/errorPlantUML.png b/site/img/errorPlantUML.png
new file mode 100644
index 0000000..d73a1ac
--- /dev/null
+++ b/site/img/errorPlantUML.png
Binary files differ
diff --git a/site/img/executeWorkflow.jpg b/site/img/executeWorkflow.jpg
new file mode 100644
index 0000000..33c19cc
--- /dev/null
+++ b/site/img/executeWorkflow.jpg
Binary files differ
diff --git a/site/img/executionResult.jpg b/site/img/executionResult.jpg
new file mode 100644
index 0000000..4050af9
--- /dev/null
+++ b/site/img/executionResult.jpg
Binary files differ
diff --git a/site/img/genconfcontent.jpg b/site/img/genconfcontent.jpg
new file mode 100644
index 0000000..a5d4c34
--- /dev/null
+++ b/site/img/genconfcontent.jpg
Binary files differ
diff --git a/site/img/genconflocation.jpg b/site/img/genconflocation.jpg
new file mode 100644
index 0000000..16a69c6
--- /dev/null
+++ b/site/img/genconflocation.jpg
Binary files differ
diff --git a/site/img/generatedCode.jpg b/site/img/generatedCode.jpg
new file mode 100644
index 0000000..f081c49
--- /dev/null
+++ b/site/img/generatedCode.jpg
Binary files differ
diff --git a/site/img/image1.jpg b/site/img/image1.jpg
new file mode 100644
index 0000000..a224d25
--- /dev/null
+++ b/site/img/image1.jpg
Binary files differ
diff --git a/site/img/image1.png b/site/img/image1.png
new file mode 100644
index 0000000..b810436
--- /dev/null
+++ b/site/img/image1.png
Binary files differ
diff --git a/site/img/image2.jpg b/site/img/image2.jpg
new file mode 100644
index 0000000..e7702e2
--- /dev/null
+++ b/site/img/image2.jpg
Binary files differ
diff --git a/site/img/image2.png b/site/img/image2.png
new file mode 100644
index 0000000..081f409
--- /dev/null
+++ b/site/img/image2.png
Binary files differ
diff --git a/site/img/image3.jpg b/site/img/image3.jpg
new file mode 100644
index 0000000..9c5e2d0
--- /dev/null
+++ b/site/img/image3.jpg
Binary files differ
diff --git a/site/img/image3.png b/site/img/image3.png
new file mode 100644
index 0000000..7defeb2
--- /dev/null
+++ b/site/img/image3.png
Binary files differ
diff --git a/site/img/image4.jpg b/site/img/image4.jpg
new file mode 100644
index 0000000..f659b58
--- /dev/null
+++ b/site/img/image4.jpg
Binary files differ
diff --git a/site/img/image4.png b/site/img/image4.png
new file mode 100644
index 0000000..aae8da9
--- /dev/null
+++ b/site/img/image4.png
Binary files differ
diff --git a/site/img/simgeneratedCode.jpg b/site/img/simgeneratedCode.jpg
new file mode 100644
index 0000000..4f8ec18
--- /dev/null
+++ b/site/img/simgeneratedCode.jpg
Binary files differ
diff --git a/site/img/statisticsCharts.png b/site/img/statisticsCharts.png
new file mode 100644
index 0000000..ee7732e
--- /dev/null
+++ b/site/img/statisticsCharts.png
Binary files differ
diff --git a/site/img/statisticsLocation.png b/site/img/statisticsLocation.png
new file mode 100644
index 0000000..c6e33cf
--- /dev/null
+++ b/site/img/statisticsLocation.png
Binary files differ
diff --git a/site/img/statisticsShowChart.png b/site/img/statisticsShowChart.png
new file mode 100644
index 0000000..8c53d1b
--- /dev/null
+++ b/site/img/statisticsShowChart.png
Binary files differ
diff --git a/site/developers.html b/site/index.html
similarity index 91%
copy from site/developers.html
copy to site/index.html
index 42a21fe..c51b644 100644
--- a/site/developers.html
+++ b/site/index.html
@@ -441,15 +441,58 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="" href="/site/download.html">Download</a></li><li><a style="font-weight: bold" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="font-weight: bold" href="index.html">Home</a></li><li><a style="" href="site/download.html">Download</a></li><li><a style="" href="site/developers.html">Developers</a></li><li><a style="" href="user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_developers"><a class="anchor" href="#_developers"></a>Developers</h2>
+<h2 id="_eclipse_commasuite_incubation"><a class="anchor" href="#_eclipse_commasuite_incubation"></a>Eclipse CommaSuite (Incubation)</h2>
 <div class="sectionbody">
+<p align="center">
+  <img width="300" src="img/banner.png">
+</p>
 <div class="paragraph">
-<p>The Eclipse CommaSuite source code is hosted on the <a href="https://gitlab.eclipse.org/eclipse/comma/comma" target="_blank" rel="noopener">Eclipse Gitlab</a>. If you want to start developing Eclipse CommaSuite read <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/blob/main/docs/developing.md" target="_blank" rel="noopener">this guide</a>.</p>
+<p>The domain-specific language of Eclipse CommaSuite allows the specification of the provided and required interfaces of a software component. Each interface is described by means of (1) a signature, i.e., the set of commands, signals and notifications that are offered by a server, (2) a protocol state machine which describes the allowed sequences of interaction events between clients and server, (3) timing constraints on the occurrence of the events, and (4) data constraints on the values communicated.  For a component, constraints can be added on the relations between its interfaces.</p>
+</div>
+<div class="paragraph">
+<p>Based on an instance of the domain-specific language, a number of artefacts can be generated. This includes visualization based on PlantUML and GraphML, documentation, and interface monitoring. Monitoring allows frequent checks on interface conformance. For instance, during nightly tests and after components updates. Monitoring is based on traces of client-server interactions, e.g., obtained via logging or sniffing. It checks whether these traces conform to the state machine behavior of the interfaces and the additional constraints.</p>
+</div>
+<div class="paragraph">
+<p>The tooling is available as standalone, an Eclipse plugin and as command line tooling for integration in the industrial workflow.</p>
+</div>
+<div class="admonitionblock warning">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-warning" title="Warning"></i>
+</td>
+<td class="content">
+<div class="paragraph">
+<p>The Eclipse CommaSuite project is in the
+<a href="https://wiki.eclipse.org/Development_Resources/Process_Guidelines/What_is_Incubation">Incubation Phase</a>.</p>
+</div>
+<div class="paragraph">
+<p><span class="image"><img src="img/eclipse-incubation.png" alt="eclipse incubation" width="300"></span></p>
+</div>
+</td>
+</tr>
+</table>
+</div>
+<div class="sect2">
+<h3 id="_external_links"><a class="anchor" href="#_external_links"></a>External links</h3>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="https://projects.eclipse.org/projects/technology.comma">Eclipse CommaSuite project page</a></p>
+</li>
+<li>
+<p><a href="https://gitlab.eclipse.org/eclipse/comma/comma">Gitlab</a></p>
+</li>
+<li>
+<p><a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/issues">Issue tracker</a></p>
+</li>
+</ul>
+</div>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/installation/manual.html
similarity index 81%
copy from site/download.html
copy to site/installation/manual.html
index 1bafd3b..c602fe3 100644
--- a/site/download.html
+++ b/site/installation/manual.html
@@ -441,103 +441,55 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="../language/language.html">Language</a><ul class="sectlevel4"><li><a style="" href="../language/types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="../language/states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="../language/components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../tutorial/intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="../tutorial/preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../tutorial/serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_installation_of_the_commasuite_tool"><a class="anchor" href="#_installation_of_the_commasuite_tool"></a><strong>Installation of the CommaSuite tool</strong></h2>
 <div class="sectionbody">
+<div class="sect2">
+<h3 id="_installation"><a class="anchor" href="#_installation"></a>Installation</h3>
 <div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
+<p>The are 3 possible ways to install Eclipse CommaSuite:</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
+<p>Download a <strong>product</strong>, which is a completely installed Eclipse,
+from folder <em>product</em>. Note that there are version for linux, macOS and Windows.</p>
 <div class="ulist">
 <ul>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
+<p>Create a folder high in the folder hierarchy
+(a deeply nested folder might give problems with long paths).
+Extract the zip file into that folder.
+This may take some time because Java is included.</p>
 </li>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
+<p>Test it by executing <em>CommaSuite.exe</em>, e.g., launching it with the default workspace.</p>
 </li>
 </ul>
 </div>
 </li>
 <li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
+<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool; see folder <em>plugin</em>.</p>
 </li>
 <li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
-</li>
-</ol>
-</div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
+<p>As a <strong>command line tool</strong>, see folder <em>cli</em>. Documentation about the command line tool can be found in the Eclipse CommaSuite User Guide.</p>
 </li>
 </ul>
 </div>
-<div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
-<div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
-</div>
 </div>
 <div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
+<h3 id="_help_and_examples"><a class="anchor" href="#_help_and_examples"></a>Help and Examples</h3>
 <div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
-<div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
-</li>
-<li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
-</li>
-<li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
-</li>
-<li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
-</li>
-</ul>
+<p>Help can be obtained in a running Eclipse with the CommaSuite framework by selecting<br>
+<em>Help &gt; Help Contents &gt; Eclipse CommaSuite User Guide</em></p>
 </div>
 <div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
+<p>The tool also provides a number of example projects, select<br>
+<em>File &gt; New &gt; Example</em></p>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/language/comments.html
similarity index 80%
copy from site/download.html
copy to site/language/comments.html
index 1bafd3b..b510ef3 100644
--- a/site/download.html
+++ b/site/language/comments.html
@@ -441,105 +441,101 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="language.html">Language</a><ul class="sectlevel4"><li><a style="" href="types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="font-weight: bold" href="comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../tutorial/intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="../tutorial/preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../tutorial/serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_using_comments_in_commasuite_models"><a class="anchor" href="#_using_comments_in_commasuite_models"></a>Using Comments in CommaSuite Models</h2>
 <div class="sectionbody">
-<div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
+<div class="paragraph normal">
+<p>Multiline and single line comments can be inserted in the CommaSuite models. Some of the comments will be included in the generated documentation and code.</p>
 </div>
-<div class="ulist">
-<ul>
-<li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
-</li>
-</ul>
-</div>
-</li>
-<li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
 <div class="olist arabic">
 <ol class="arabic">
 <li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
-</li>
-<li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
-</li>
-</ol>
-</div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
-</div>
-<div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
-<div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
-<div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
-<div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
-</div>
+<p>Multiline comments will be included in generated documentation and code if they are placed <em>before</em> the following constructs:</p>
 <div class="ulist">
 <ul>
 <li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
+<p>Type declarations</p>
 </li>
 <li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
+<p>Interface event declarations (commands, signals, and notifications)</p>
 </li>
 <li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
+<p>Variable declarations and initializations in behavioral models</p>
 </li>
 <li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
+<p>Interface definitions</p>
+</li>
+<li>
+<p>State machines</p>
+</li>
+<li>
+<p>States</p>
+</li>
+<li>
+<p>Transitions</p>
+</li>
+<li>
+<p>Time and data constraints</p>
+<div class="paragraph">
+<p>The following is an example of a multiline comment placed before a type declaration:</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>/*
+ * Type for personal information
+ */
+
+record Person {
+    string name
+    string address
+}</pre>
+</div>
+</div>
 </li>
 </ul>
 </div>
-<div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
+</li>
+<li>
+<p>Parameters and return values of interface events can be documented by using two Doxygen tags placed in a multiline comment:</p>
+<div class="literalblock">
+<div class="content">
+<pre>/*
+ * Simulates the occurrence of an internal event
+ * \param ev the kind of the event, e.g. internal error, timeout, etc.
+ * \return result that indicates if the execution of the command will have an effect
+ */
+
+commands
+Status InjectEvent(EventKind ev)</pre>
 </div>
 </div>
+</li>
+<li>
+<p>Record fields and enumeration literals can be documented by arranging them on separate lines and placing a single line comment <em>after</em> them:</p>
+<div class="literalblock">
+<div class="content">
+<pre>/*
+ * Type for personal information
+ */
+
+record Person {
+    string name //Person name
+    string address //Person address
+}
+
+enum Status {
+    OK //Successful execution
+    Failed //Execution failed
+}</pre>
+</div>
+</div>
+</li>
+</ol>
+</div>
 </div>
 </div>
 </div>
diff --git a/site/language/components.html b/site/language/components.html
new file mode 100644
index 0000000..c31c604
--- /dev/null
+++ b/site/language/components.html
@@ -0,0 +1,908 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<meta name="generator" content="Asciidoctor 2.0.15">
+<link rel="icon" type="image/png" href="/favicon.png">
+<title>Eclipse CommaSuite</title>
+<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700">
+<style>
+/* Asciidoctor default stylesheet | MIT License | https://asciidoctor.org */
+/* Uncomment @import statement to use as custom stylesheet */
+/*@import "https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700";*/
+article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}
+audio,video{display:inline-block}
+audio:not([controls]){display:none;height:0}
+html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}
+a{background:none}
+a:focus{outline:thin dotted}
+a:active,a:hover{outline:0}
+h1{font-size:2em;margin:.67em 0}
+abbr[title]{border-bottom:1px dotted}
+b,strong{font-weight:bold}
+dfn{font-style:italic}
+hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}
+mark{background:#ff0;color:#000}
+code,kbd,pre,samp{font-family:monospace;font-size:1em}
+pre{white-space:pre-wrap}
+q{quotes:"\201C" "\201D" "\2018" "\2019"}
+small{font-size:80%}
+sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}
+sup{top:-.5em}
+sub{bottom:-.25em}
+img{border:0}
+svg:not(:root){overflow:hidden}
+figure{margin:0}
+fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}
+legend{border:0;padding:0}
+button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}
+button,input{line-height:normal}
+button,select{text-transform:none}
+button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}
+button[disabled],html input[disabled]{cursor:default}
+input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}
+button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}
+textarea{overflow:auto;vertical-align:top}
+table{border-collapse:collapse;border-spacing:0}
+*,*::before,*::after{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}
+html,body{font-size:100%}
+body{background:#fff;color:rgba(0,0,0,.8);padding:0;margin:0;font-family:"Noto Serif","DejaVu Serif",serif;font-weight:400;font-style:normal;line-height:1;position:relative;cursor:auto;tab-size:4;word-wrap:anywhere;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased}
+a:hover{cursor:pointer}
+img,object,embed{max-width:100%;height:auto}
+object,embed{height:100%}
+img{-ms-interpolation-mode:bicubic}
+.left{float:left!important}
+.right{float:right!important}
+.text-left{text-align:left!important}
+.text-right{text-align:right!important}
+.text-center{text-align:center!important}
+.text-justify{text-align:justify!important}
+.hide{display:none}
+img,object,svg{display:inline-block;vertical-align:middle}
+textarea{height:auto;min-height:50px}
+select{width:100%}
+.subheader,.admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{line-height:1.45;color:#7a2518;font-weight:400;margin-top:0;margin-bottom:.25em}
+div,dl,dt,dd,ul,ol,li,h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6,pre,form,p,blockquote,th,td{margin:0;padding:0}
+a{color:#2156a5;text-decoration:underline;line-height:inherit}
+a:hover,a:focus{color:#1d4b8f}
+a img{border:0}
+p{font-family:inherit;font-weight:400;font-size:1em;line-height:1.6;margin-bottom:1.25em;text-rendering:optimizeLegibility}
+p aside{font-size:.875em;line-height:1.35;font-style:italic}
+h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{font-family:"Open Sans","DejaVu Sans",sans-serif;font-weight:300;font-style:normal;color:#ba3925;text-rendering:optimizeLegibility;margin-top:1em;margin-bottom:.5em;line-height:1.0125em}
+h1 small,h2 small,h3 small,#toctitle small,.sidebarblock>.content>.title small,h4 small,h5 small,h6 small{font-size:60%;color:#e99b8f;line-height:0}
+h1{font-size:2.125em}
+h2{font-size:1.6875em}
+h3,#toctitle,.sidebarblock>.content>.title{font-size:1.375em}
+h4,h5{font-size:1.125em}
+h6{font-size:1em}
+hr{border:solid #dddddf;border-width:1px 0 0;clear:both;margin:1.25em 0 1.1875em;height:0}
+em,i{font-style:italic;line-height:inherit}
+strong,b{font-weight:bold;line-height:inherit}
+small{font-size:60%;line-height:inherit}
+code{font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;font-weight:400;color:rgba(0,0,0,.9)}
+ul,ol,dl{font-size:1em;line-height:1.6;margin-bottom:1.25em;list-style-position:outside;font-family:inherit}
+ul,ol{margin-left:1.5em}
+ul li ul,ul li ol{margin-left:1.25em;margin-bottom:0;font-size:1em}
+ul.square li ul,ul.circle li ul,ul.disc li ul{list-style:inherit}
+ul.square{list-style-type:square}
+ul.circle{list-style-type:circle}
+ul.disc{list-style-type:disc}
+ol li ul,ol li ol{margin-left:1.25em;margin-bottom:0}
+dl dt{margin-bottom:.3125em;font-weight:bold}
+dl dd{margin-bottom:1.25em}
+abbr,acronym{text-transform:uppercase;font-size:90%;color:rgba(0,0,0,.8);border-bottom:1px dotted #ddd;cursor:help}
+abbr{text-transform:none}
+blockquote{margin:0 0 1.25em;padding:.5625em 1.25em 0 1.1875em;border-left:1px solid #ddd}
+blockquote,blockquote p{line-height:1.6;color:rgba(0,0,0,.85)}
+@media screen and (min-width:768px){h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2}
+h1{font-size:2.75em}
+h2{font-size:2.3125em}
+h3,#toctitle,.sidebarblock>.content>.title{font-size:1.6875em}
+h4{font-size:1.4375em}}
+table{background:#fff;margin-bottom:1.25em;border:solid 1px #dedede;word-wrap:normal}
+table thead,table tfoot{background:#f7f8f7}
+table thead tr th,table thead tr td,table tfoot tr th,table tfoot tr td{padding:.5em .625em .625em;font-size:inherit;color:rgba(0,0,0,.8);text-align:left}
+table tr th,table tr td{padding:.5625em .625em;font-size:inherit;color:rgba(0,0,0,.8)}
+table tr.even,table tr.alt{background:#f8f8f7}
+table thead tr th,table tfoot tr th,table tbody tr td,table tr td,table tfoot tr td{line-height:1.6}
+h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2;word-spacing:-.05em}
+h1 strong,h2 strong,h3 strong,#toctitle strong,.sidebarblock>.content>.title strong,h4 strong,h5 strong,h6 strong{font-weight:400}
+.center{margin-left:auto;margin-right:auto}
+.stretch{width:100%}
+.clearfix::before,.clearfix::after,.float-group::before,.float-group::after{content:" ";display:table}
+.clearfix::after,.float-group::after{clear:both}
+:not(pre).nobreak{word-wrap:normal}
+:not(pre).nowrap{white-space:nowrap}
+:not(pre).pre-wrap{white-space:pre-wrap}
+:not(pre):not([class^=L])>code{font-size:.9375em;font-style:normal!important;letter-spacing:0;padding:.1em .5ex;word-spacing:-.15em;background:#f7f7f8;-webkit-border-radius:4px;border-radius:4px;line-height:1.45;text-rendering:optimizeSpeed}
+pre{color:rgba(0,0,0,.9);font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;line-height:1.45;text-rendering:optimizeSpeed}
+pre code,pre pre{color:inherit;font-size:inherit;line-height:inherit}
+pre>code{display:block}
+pre.nowrap,pre.nowrap pre{white-space:pre;word-wrap:normal}
+em em{font-style:normal}
+strong strong{font-weight:400}
+.keyseq{color:rgba(51,51,51,.8)}
+kbd{font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;display:inline-block;color:rgba(0,0,0,.8);font-size:.65em;line-height:1.45;background:#f7f7f7;border:1px solid #ccc;-webkit-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 0 rgba(0,0,0,.2),0 0 0 .1em white inset;box-shadow:0 1px 0 rgba(0,0,0,.2),0 0 0 .1em #fff inset;margin:0 .15em;padding:.2em .5em;vertical-align:middle;position:relative;top:-.1em;white-space:nowrap}
+.keyseq kbd:first-child{margin-left:0}
+.keyseq kbd:last-child{margin-right:0}
+.menuseq,.menuref{color:#000}
+.menuseq b:not(.caret),.menuref{font-weight:inherit}
+.menuseq{word-spacing:-.02em}
+.menuseq b.caret{font-size:1.25em;line-height:.8}
+.menuseq i.caret{font-weight:bold;text-align:center;width:.45em}
+b.button::before,b.button::after{position:relative;top:-1px;font-weight:400}
+b.button::before{content:"[";padding:0 3px 0 2px}
+b.button::after{content:"]";padding:0 2px 0 3px}
+p a>code:hover{color:rgba(0,0,0,.9)}
+#header,#content,#footnotes,#footer{width:100%;margin-left:auto;margin-right:auto;margin-top:0;margin-bottom:0;max-width:62.5em;*zoom:1;position:relative;padding-left:.9375em;padding-right:.9375em}
+#header::before,#header::after,#content::before,#content::after,#footnotes::before,#footnotes::after,#footer::before,#footer::after{content:" ";display:table}
+#header::after,#content::after,#footnotes::after,#footer::after{clear:both}
+#content{margin-top:1.25em}
+#content::before{content:none}
+#header>h1:first-child{color:rgba(0,0,0,.85);margin-top:2.25rem;margin-bottom:0}
+#header>h1:first-child+#toc{margin-top:8px;border-top:1px solid #dddddf}
+#header>h1:only-child,body.toc2 #header>h1:nth-last-child(2){border-bottom:1px solid #dddddf;padding-bottom:8px}
+#header .details{border-bottom:1px solid #dddddf;line-height:1.45;padding-top:.25em;padding-bottom:.25em;padding-left:.25em;color:rgba(0,0,0,.6);display:-ms-flexbox;display:-webkit-flex;display:flex;-ms-flex-flow:row wrap;-webkit-flex-flow:row wrap;flex-flow:row wrap}
+#header .details span:first-child{margin-left:-.125em}
+#header .details span.email a{color:rgba(0,0,0,.85)}
+#header .details br{display:none}
+#header .details br+span::before{content:"\00a0\2013\00a0"}
+#header .details br+span.author::before{content:"\00a0\22c5\00a0";color:rgba(0,0,0,.85)}
+#header .details br+span#revremark::before{content:"\00a0|\00a0"}
+#header #revnumber{text-transform:capitalize}
+#header #revnumber::after{content:"\00a0"}
+#content>h1:first-child:not([class]){color:rgba(0,0,0,.85);border-bottom:1px solid #dddddf;padding-bottom:8px;margin-top:0;padding-top:1rem;margin-bottom:1.25rem}
+#toc{border-bottom:1px solid #e7e7e9;padding-bottom:.5em}
+#toc>ul{margin-left:.125em}
+#toc ul.sectlevel0>li>a{font-style:italic}
+#toc ul.sectlevel0 ul.sectlevel1{margin:.5em 0}
+#toc ul{font-family:"Open Sans","DejaVu Sans",sans-serif;list-style-type:none}
+#toc li{line-height:1.3334;margin-top:.3334em}
+#toc a{text-decoration:none}
+#toc a:active{text-decoration:underline}
+#toctitle{color:#7a2518;font-size:1.2em}
+@media screen and (min-width:768px){#toctitle{font-size:1.375em}
+body.toc2{padding-left:15em;padding-right:0}
+#toc.toc2{margin-top:0!important;background:#f8f8f7;position:fixed;width:15em;left:0;top:0;border-right:1px solid #e7e7e9;border-top-width:0!important;border-bottom-width:0!important;z-index:1000;padding:1.25em 1em;height:100%;overflow:auto}
+#toc.toc2 #toctitle{margin-top:0;margin-bottom:.8rem;font-size:1.2em}
+#toc.toc2>ul{font-size:.9em;margin-bottom:0}
+#toc.toc2 ul ul{margin-left:0;padding-left:1em}
+#toc.toc2 ul.sectlevel0 ul.sectlevel1{padding-left:0;margin-top:.5em;margin-bottom:.5em}
+body.toc2.toc-right{padding-left:0;padding-right:15em}
+body.toc2.toc-right #toc.toc2{border-right-width:0;border-left:1px solid #e7e7e9;left:auto;right:0}}
+@media screen and (min-width:1280px){body.toc2{padding-left:20em;padding-right:0}
+#toc.toc2{width:20em}
+#toc.toc2 #toctitle{font-size:1.375em}
+#toc.toc2>ul{font-size:.95em}
+#toc.toc2 ul ul{padding-left:1.25em}
+body.toc2.toc-right{padding-left:0;padding-right:20em}}
+#content #toc{border-style:solid;border-width:1px;border-color:#e0e0dc;margin-bottom:1.25em;padding:1.25em;background:#f8f8f7;-webkit-border-radius:4px;border-radius:4px}
+#content #toc>:first-child{margin-top:0}
+#content #toc>:last-child{margin-bottom:0}
+#footer{max-width:none;background:rgba(0,0,0,.8);padding:1.25em}
+#footer-text{color:rgba(255,255,255,.8);line-height:1.44}
+#content{margin-bottom:.625em}
+.sect1{padding-bottom:.625em}
+@media screen and (min-width:768px){#content{margin-bottom:1.25em}
+.sect1{padding-bottom:1.25em}}
+.sect1:last-child{padding-bottom:0}
+.sect1+.sect1{border-top:1px solid #e7e7e9}
+#content h1>a.anchor,h2>a.anchor,h3>a.anchor,#toctitle>a.anchor,.sidebarblock>.content>.title>a.anchor,h4>a.anchor,h5>a.anchor,h6>a.anchor{position:absolute;z-index:1001;width:1.5ex;margin-left:-1.5ex;display:block;text-decoration:none!important;visibility:hidden;text-align:center;font-weight:400}
+#content h1>a.anchor::before,h2>a.anchor::before,h3>a.anchor::before,#toctitle>a.anchor::before,.sidebarblock>.content>.title>a.anchor::before,h4>a.anchor::before,h5>a.anchor::before,h6>a.anchor::before{content:"\00A7";font-size:.85em;display:block;padding-top:.1em}
+#content h1:hover>a.anchor,#content h1>a.anchor:hover,h2:hover>a.anchor,h2>a.anchor:hover,h3:hover>a.anchor,#toctitle:hover>a.anchor,.sidebarblock>.content>.title:hover>a.anchor,h3>a.anchor:hover,#toctitle>a.anchor:hover,.sidebarblock>.content>.title>a.anchor:hover,h4:hover>a.anchor,h4>a.anchor:hover,h5:hover>a.anchor,h5>a.anchor:hover,h6:hover>a.anchor,h6>a.anchor:hover{visibility:visible}
+#content h1>a.link,h2>a.link,h3>a.link,#toctitle>a.link,.sidebarblock>.content>.title>a.link,h4>a.link,h5>a.link,h6>a.link{color:#ba3925;text-decoration:none}
+#content h1>a.link:hover,h2>a.link:hover,h3>a.link:hover,#toctitle>a.link:hover,.sidebarblock>.content>.title>a.link:hover,h4>a.link:hover,h5>a.link:hover,h6>a.link:hover{color:#a53221}
+details,.audioblock,.imageblock,.literalblock,.listingblock,.stemblock,.videoblock{margin-bottom:1.25em}
+details>summary:first-of-type{cursor:pointer;display:list-item;outline:none;margin-bottom:.75em}
+.admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{text-rendering:optimizeLegibility;text-align:left;font-family:"Noto Serif","DejaVu Serif",serif;font-size:1rem;font-style:italic}
+table.tableblock.fit-content>caption.title{white-space:nowrap;width:0}
+.paragraph.lead>p,#preamble>.sectionbody>[class="paragraph"]:first-of-type p{font-size:1.21875em;line-height:1.6;color:rgba(0,0,0,.85)}
+table.tableblock #preamble>.sectionbody>[class="paragraph"]:first-of-type p{font-size:inherit}
+.admonitionblock>table{border-collapse:separate;border:0;background:none;width:100%}
+.admonitionblock>table td.icon{text-align:center;width:80px}
+.admonitionblock>table td.icon img{max-width:none}
+.admonitionblock>table td.icon .title{font-weight:bold;font-family:"Open Sans","DejaVu Sans",sans-serif;text-transform:uppercase}
+.admonitionblock>table td.content{padding-left:1.125em;padding-right:1.25em;border-left:1px solid #dddddf;color:rgba(0,0,0,.6);word-wrap:anywhere}
+.admonitionblock>table td.content>:last-child>:last-child{margin-bottom:0}
+.exampleblock>.content{border-style:solid;border-width:1px;border-color:#e6e6e6;margin-bottom:1.25em;padding:1.25em;background:#fff;-webkit-border-radius:4px;border-radius:4px}
+.exampleblock>.content>:first-child{margin-top:0}
+.exampleblock>.content>:last-child{margin-bottom:0}
+.sidebarblock{border-style:solid;border-width:1px;border-color:#dbdbd6;margin-bottom:1.25em;padding:1.25em;background:#f3f3f2;-webkit-border-radius:4px;border-radius:4px}
+.sidebarblock>:first-child{margin-top:0}
+.sidebarblock>:last-child{margin-bottom:0}
+.sidebarblock>.content>.title{color:#7a2518;margin-top:0;text-align:center}
+.exampleblock>.content>:last-child>:last-child,.exampleblock>.content .olist>ol>li:last-child>:last-child,.exampleblock>.content .ulist>ul>li:last-child>:last-child,.exampleblock>.content .qlist>ol>li:last-child>:last-child,.sidebarblock>.content>:last-child>:last-child,.sidebarblock>.content .olist>ol>li:last-child>:last-child,.sidebarblock>.content .ulist>ul>li:last-child>:last-child,.sidebarblock>.content .qlist>ol>li:last-child>:last-child{margin-bottom:0}
+.literalblock pre,.listingblock>.content>pre{-webkit-border-radius:4px;border-radius:4px;overflow-x:auto;padding:1em;font-size:.8125em}
+@media screen and (min-width:768px){.literalblock pre,.listingblock>.content>pre{font-size:.90625em}}
+@media screen and (min-width:1280px){.literalblock pre,.listingblock>.content>pre{font-size:1em}}
+.literalblock pre,.listingblock>.content>pre:not(.highlight),.listingblock>.content>pre[class="highlight"],.listingblock>.content>pre[class^="highlight "]{background:#f7f7f8}
+.literalblock.output pre{color:#f7f7f8;background:rgba(0,0,0,.9)}
+.listingblock>.content{position:relative}
+.listingblock code[data-lang]::before{display:none;content:attr(data-lang);position:absolute;font-size:.75em;top:.425rem;right:.5rem;line-height:1;text-transform:uppercase;color:inherit;opacity:.5}
+.listingblock:hover code[data-lang]::before{display:block}
+.listingblock.terminal pre .command::before{content:attr(data-prompt);padding-right:.5em;color:inherit;opacity:.5}
+.listingblock.terminal pre .command:not([data-prompt])::before{content:"$"}
+.listingblock pre.highlightjs{padding:0}
+.listingblock pre.highlightjs>code{padding:1em;-webkit-border-radius:4px;border-radius:4px}
+.listingblock pre.prettyprint{border-width:0}
+.prettyprint{background:#f7f7f8}
+pre.prettyprint .linenums{line-height:1.45;margin-left:2em}
+pre.prettyprint li{background:none;list-style-type:inherit;padding-left:0}
+pre.prettyprint li code[data-lang]::before{opacity:1}
+pre.prettyprint li:not(:first-child) code[data-lang]::before{display:none}
+table.linenotable{border-collapse:separate;border:0;margin-bottom:0;background:none}
+table.linenotable td[class]{color:inherit;vertical-align:top;padding:0;line-height:inherit;white-space:normal}
+table.linenotable td.code{padding-left:.75em}
+table.linenotable td.linenos{border-right:1px solid currentColor;opacity:.35;padding-right:.5em}
+pre.pygments .lineno{border-right:1px solid currentColor;opacity:.35;display:inline-block;margin-right:.75em}
+pre.pygments .lineno::before{content:"";margin-right:-.125em}
+.quoteblock{margin:0 1em 1.25em 1.5em;display:table}
+.quoteblock:not(.excerpt)>.title{margin-left:-1.5em;margin-bottom:.75em}
+.quoteblock blockquote,.quoteblock p{color:rgba(0,0,0,.85);font-size:1.15rem;line-height:1.75;word-spacing:.1em;letter-spacing:0;font-style:italic;text-align:justify}
+.quoteblock blockquote{margin:0;padding:0;border:0}
+.quoteblock blockquote::before{content:"\201c";float:left;font-size:2.75em;font-weight:bold;line-height:.6em;margin-left:-.6em;color:#7a2518;text-shadow:0 1px 2px rgba(0,0,0,.1)}
+.quoteblock blockquote>.paragraph:last-child p{margin-bottom:0}
+.quoteblock .attribution{margin-top:.75em;margin-right:.5ex;text-align:right}
+.verseblock{margin:0 1em 1.25em}
+.verseblock pre{font-family:"Open Sans","DejaVu Sans",sans;font-size:1.15rem;color:rgba(0,0,0,.85);font-weight:300;text-rendering:optimizeLegibility}
+.verseblock pre strong{font-weight:400}
+.verseblock .attribution{margin-top:1.25rem;margin-left:.5ex}
+.quoteblock .attribution,.verseblock .attribution{font-size:.9375em;line-height:1.45;font-style:italic}
+.quoteblock .attribution br,.verseblock .attribution br{display:none}
+.quoteblock .attribution cite,.verseblock .attribution cite{display:block;letter-spacing:-.025em;color:rgba(0,0,0,.6)}
+.quoteblock.abstract blockquote::before,.quoteblock.excerpt blockquote::before,.quoteblock .quoteblock blockquote::before{display:none}
+.quoteblock.abstract blockquote,.quoteblock.abstract p,.quoteblock.excerpt blockquote,.quoteblock.excerpt p,.quoteblock .quoteblock blockquote,.quoteblock .quoteblock p{line-height:1.6;word-spacing:0}
+.quoteblock.abstract{margin:0 1em 1.25em;display:block}
+.quoteblock.abstract>.title{margin:0 0 .375em;font-size:1.15em;text-align:center}
+.quoteblock.excerpt>blockquote,.quoteblock .quoteblock{padding:0 0 .25em 1em;border-left:.25em solid #dddddf}
+.quoteblock.excerpt,.quoteblock .quoteblock{margin-left:0}
+.quoteblock.excerpt blockquote,.quoteblock.excerpt p,.quoteblock .quoteblock blockquote,.quoteblock .quoteblock p{color:inherit;font-size:1.0625rem}
+.quoteblock.excerpt .attribution,.quoteblock .quoteblock .attribution{color:inherit;font-size:.85rem;text-align:left;margin-right:0}
+p.tableblock:last-child{margin-bottom:0}
+td.tableblock>.content{margin-bottom:1.25em;word-wrap:anywhere}
+td.tableblock>.content>:last-child{margin-bottom:-1.25em}
+table.tableblock,th.tableblock,td.tableblock{border:0 solid #dedede}
+table.grid-all>*>tr>*{border-width:1px}
+table.grid-cols>*>tr>*{border-width:0 1px}
+table.grid-rows>*>tr>*{border-width:1px 0}
+table.frame-all{border-width:1px}
+table.frame-ends{border-width:1px 0}
+table.frame-sides{border-width:0 1px}
+table.frame-none>colgroup+*>:first-child>*,table.frame-sides>colgroup+*>:first-child>*{border-top-width:0}
+table.frame-none>:last-child>:last-child>*,table.frame-sides>:last-child>:last-child>*{border-bottom-width:0}
+table.frame-none>*>tr>:first-child,table.frame-ends>*>tr>:first-child{border-left-width:0}
+table.frame-none>*>tr>:last-child,table.frame-ends>*>tr>:last-child{border-right-width:0}
+table.stripes-all tr,table.stripes-odd tr:nth-of-type(odd),table.stripes-even tr:nth-of-type(even),table.stripes-hover tr:hover{background:#f8f8f7}
+th.halign-left,td.halign-left{text-align:left}
+th.halign-right,td.halign-right{text-align:right}
+th.halign-center,td.halign-center{text-align:center}
+th.valign-top,td.valign-top{vertical-align:top}
+th.valign-bottom,td.valign-bottom{vertical-align:bottom}
+th.valign-middle,td.valign-middle{vertical-align:middle}
+table thead th,table tfoot th{font-weight:bold}
+tbody tr th{background:#f7f8f7}
+tbody tr th,tbody tr th p,tfoot tr th,tfoot tr th p{color:rgba(0,0,0,.8);font-weight:bold}
+p.tableblock>code:only-child{background:none;padding:0}
+p.tableblock{font-size:1em}
+ol{margin-left:1.75em}
+ul li ol{margin-left:1.5em}
+dl dd{margin-left:1.125em}
+dl dd:last-child,dl dd:last-child>:last-child{margin-bottom:0}
+ol>li p,ul>li p,ul dd,ol dd,.olist .olist,.ulist .ulist,.ulist .olist,.olist .ulist{margin-bottom:.625em}
+ul.checklist,ul.none,ol.none,ul.no-bullet,ol.no-bullet,ol.unnumbered,ul.unstyled,ol.unstyled{list-style-type:none}
+ul.no-bullet,ol.no-bullet,ol.unnumbered{margin-left:.625em}
+ul.unstyled,ol.unstyled{margin-left:0}
+ul.checklist{margin-left:.625em}
+ul.checklist li>p:first-child>.fa-square-o:first-child,ul.checklist li>p:first-child>.fa-check-square-o:first-child{width:1.25em;font-size:.8em;position:relative;bottom:.125em}
+ul.checklist li>p:first-child>input[type="checkbox"]:first-child{margin-right:.25em}
+ul.inline{display:-ms-flexbox;display:-webkit-box;display:flex;-ms-flex-flow:row wrap;-webkit-flex-flow:row wrap;flex-flow:row wrap;list-style:none;margin:0 0 .625em -1.25em}
+ul.inline>li{margin-left:1.25em}
+.unstyled dl dt{font-weight:400;font-style:normal}
+ol.arabic{list-style-type:decimal}
+ol.decimal{list-style-type:decimal-leading-zero}
+ol.loweralpha{list-style-type:lower-alpha}
+ol.upperalpha{list-style-type:upper-alpha}
+ol.lowerroman{list-style-type:lower-roman}
+ol.upperroman{list-style-type:upper-roman}
+ol.lowergreek{list-style-type:lower-greek}
+.hdlist>table,.colist>table{border:0;background:none}
+.hdlist>table>tbody>tr,.colist>table>tbody>tr{background:none}
+td.hdlist1,td.hdlist2{vertical-align:top;padding:0 .625em}
+td.hdlist1{font-weight:bold;padding-bottom:1.25em}
+td.hdlist2{word-wrap:anywhere}
+.literalblock+.colist,.listingblock+.colist{margin-top:-.5em}
+.colist td:not([class]):first-child{padding:.4em .75em 0;line-height:1;vertical-align:top}
+.colist td:not([class]):first-child img{max-width:none}
+.colist td:not([class]):last-child{padding:.25em 0}
+.thumb,.th{line-height:0;display:inline-block;border:solid 4px #fff;-webkit-box-shadow:0 0 0 1px #ddd;box-shadow:0 0 0 1px #ddd}
+.imageblock.left{margin:.25em .625em 1.25em 0}
+.imageblock.right{margin:.25em 0 1.25em .625em}
+.imageblock>.title{margin-bottom:0}
+.imageblock.thumb,.imageblock.th{border-width:6px}
+.imageblock.thumb>.title,.imageblock.th>.title{padding:0 .125em}
+.image.left,.image.right{margin-top:.25em;margin-bottom:.25em;display:inline-block;line-height:0}
+.image.left{margin-right:.625em}
+.image.right{margin-left:.625em}
+a.image{text-decoration:none;display:inline-block}
+a.image object{pointer-events:none}
+sup.footnote,sup.footnoteref{font-size:.875em;position:static;vertical-align:super}
+sup.footnote a,sup.footnoteref a{text-decoration:none}
+sup.footnote a:active,sup.footnoteref a:active{text-decoration:underline}
+#footnotes{padding-top:.75em;padding-bottom:.75em;margin-bottom:.625em}
+#footnotes hr{width:20%;min-width:6.25em;margin:-.25em 0 .75em;border-width:1px 0 0}
+#footnotes .footnote{padding:0 .375em 0 .225em;line-height:1.3334;font-size:.875em;margin-left:1.2em;margin-bottom:.2em}
+#footnotes .footnote a:first-of-type{font-weight:bold;text-decoration:none;margin-left:-1.05em}
+#footnotes .footnote:last-of-type{margin-bottom:0}
+#content #footnotes{margin-top:-.625em;margin-bottom:0;padding:.75em 0}
+.gist .file-data>table{border:0;background:#fff;width:100%;margin-bottom:0}
+.gist .file-data>table td.line-data{width:99%}
+div.unbreakable{page-break-inside:avoid}
+.big{font-size:larger}
+.small{font-size:smaller}
+.underline{text-decoration:underline}
+.overline{text-decoration:overline}
+.line-through{text-decoration:line-through}
+.aqua{color:#00bfbf}
+.aqua-background{background:#00fafa}
+.black{color:#000}
+.black-background{background:#000}
+.blue{color:#0000bf}
+.blue-background{background:#0000fa}
+.fuchsia{color:#bf00bf}
+.fuchsia-background{background:#fa00fa}
+.gray{color:#606060}
+.gray-background{background:#7d7d7d}
+.green{color:#006000}
+.green-background{background:#007d00}
+.lime{color:#00bf00}
+.lime-background{background:#00fa00}
+.maroon{color:#600000}
+.maroon-background{background:#7d0000}
+.navy{color:#000060}
+.navy-background{background:#00007d}
+.olive{color:#606000}
+.olive-background{background:#7d7d00}
+.purple{color:#600060}
+.purple-background{background:#7d007d}
+.red{color:#bf0000}
+.red-background{background:#fa0000}
+.silver{color:#909090}
+.silver-background{background:#bcbcbc}
+.teal{color:#006060}
+.teal-background{background:#007d7d}
+.white{color:#bfbfbf}
+.white-background{background:#fafafa}
+.yellow{color:#bfbf00}
+.yellow-background{background:#fafa00}
+span.icon>.fa{cursor:default}
+a span.icon>.fa{cursor:inherit}
+.admonitionblock td.icon [class^="fa icon-"]{font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
+.admonitionblock td.icon .icon-note::before{content:"\f05a";color:#19407c}
+.admonitionblock td.icon .icon-tip::before{content:"\f0eb";text-shadow:1px 1px 2px rgba(155,155,0,.8);color:#111}
+.admonitionblock td.icon .icon-warning::before{content:"\f071";color:#bf6900}
+.admonitionblock td.icon .icon-caution::before{content:"\f06d";color:#bf3400}
+.admonitionblock td.icon .icon-important::before{content:"\f06a";color:#bf0000}
+.conum[data-value]{display:inline-block;color:#fff!important;background:rgba(0,0,0,.8);-webkit-border-radius:50%;border-radius:50%;text-align:center;font-size:.75em;width:1.67em;height:1.67em;line-height:1.67em;font-family:"Open Sans","DejaVu Sans",sans-serif;font-style:normal;font-weight:bold}
+.conum[data-value] *{color:#fff!important}
+.conum[data-value]+b{display:none}
+.conum[data-value]::after{content:attr(data-value)}
+pre .conum[data-value]{position:relative;top:-.125em}
+b.conum *{color:inherit!important}
+.conum:not([data-value]):empty{display:none}
+dt,th.tableblock,td.content,div.footnote{text-rendering:optimizeLegibility}
+h1,h2,p,td.content,span.alt{letter-spacing:-.01em}
+p strong,td.content strong,div.footnote strong{letter-spacing:-.005em}
+p,blockquote,dt,td.content,span.alt{font-size:1.0625rem}
+p{margin-bottom:1.25rem}
+.sidebarblock p,.sidebarblock dt,.sidebarblock td.content,p.tableblock{font-size:1em}
+.exampleblock>.content{background:#fffef7;border-color:#e0e0dc;-webkit-box-shadow:0 1px 4px #e0e0dc;box-shadow:0 1px 4px #e0e0dc}
+.print-only{display:none!important}
+@page{margin:1.25cm .75cm}
+@media print{*{-webkit-box-shadow:none!important;box-shadow:none!important;text-shadow:none!important}
+html{font-size:80%}
+a{color:inherit!important;text-decoration:underline!important}
+a.bare,a[href^="#"],a[href^="mailto:"]{text-decoration:none!important}
+a[href^="http:"]:not(.bare)::after,a[href^="https:"]:not(.bare)::after{content:"(" attr(href) ")";display:inline-block;font-size:.875em;padding-left:.25em}
+abbr[title]::after{content:" (" attr(title) ")"}
+pre,blockquote,tr,img,object,svg{page-break-inside:avoid}
+thead{display:table-header-group}
+svg{max-width:100%}
+p,blockquote,dt,td.content{font-size:1em;orphans:3;widows:3}
+h2,h3,#toctitle,.sidebarblock>.content>.title{page-break-after:avoid}
+#header,#content,#footnotes,#footer{max-width:none}
+#toc,.sidebarblock,.exampleblock>.content{background:none!important}
+#toc{border-bottom:1px solid #dddddf!important;padding-bottom:0!important}
+body.book #header{text-align:center}
+body.book #header>h1:first-child{border:0!important;margin:2.5em 0 1em}
+body.book #header .details{border:0!important;display:block;padding:0!important}
+body.book #header .details span:first-child{margin-left:0!important}
+body.book #header .details br{display:block}
+body.book #header .details br+span::before{content:none!important}
+body.book #toc{border:0!important;text-align:left!important;padding:0!important;margin:0!important}
+body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-break-before:always}
+.listingblock code[data-lang]::before{display:block}
+#footer{padding:0 .9375em}
+.hide-on-print{display:none!important}
+.print-only{display:block!important}
+.hide-for-print{display:none!important}
+.show-for-print{display:inherit!important}}
+@media print,amzn-kf8{#header>h1:first-child{margin-top:1.25rem}
+.sect1{padding:0!important}
+.sect1+.sect1{border:0}
+#footer{background:none}
+#footer-text{color:rgba(0,0,0,.6);font-size:.9em}}
+@media amzn-kf8{#header,#content,#footnotes,#footer{padding:0}}
+</style>
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+</head>
+<body class="article toc2 toc-left">
+<div id="header">
+<div id="toc" class="toc2">
+<div id="toctitle">Index</div>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="language.html">Language</a><ul class="sectlevel4"><li><a style="" href="types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="font-weight: bold" href="components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../tutorial/intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="../tutorial/preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../tutorial/serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
+</div>
+</div>
+<div id="content">
+<div class="sect1">
+<h2 id="_components"><a class="anchor" href="#_components"></a>Components</h2>
+<div class="sectionbody">
+<div class="paragraph normal">
+<p>Several interfaces are typically used together in the scope of a software sub-system where some of them are exposed to clients and the sub-system itself is a client for other sub-systems via their interfaces. In such a scope, interfaces may have interdependencies manifested as constraints on the allowed order of their events.
+As a trivial example consider a car that first has to be started (by pressing the 'start' button) and only after that the driver can operate the car entertainment touch screen.
+The actions of starting the car and starting the MP3 player may logically belong to different interfaces still obeying some cross-interface rules.
+The rules for using several interfaces together need to be explicitly given similarly to the rules for a single interface.</p>
+</div>
+<div class="paragraph">
+<p>In the CommaSuite framework, this need is addressed in component models.
+A component is an abstraction where several interfaces are used together and specifies how these interfaces interact with each other.
+Furthermore, a component may impose restrictions on the interaction among possibly multiple clients of the same interface.
+The name 'component' may clash with the same name used to denote a unit in a software/system logical or physical architecture.
+In this respect, a CommaSuite component does not necessarily correspond to an architectural or implementation construct that might also be named 'component'.</p>
+</div>
+<div class="sect2">
+<h3 id="_syntax_of_component_models"><a class="anchor" href="#_syntax_of_component_models"></a>Syntax of Component Models</h3>
+<div class="paragraph">
+<p>Component models are stored in files with extension 'component'. A component has number of <em>ports</em>, each port associated to a CommaSuite interface. Ports are connection points of the component and are classified as <em>provided</em> or <em>required</em>. A provided port is used by the clients of the component to communicate with it following the port&#8217;s interface protocol. A required port is used by the component to communicate with its environment (in the role of a client), again following the corresponding interface protocol. All ports are named. It is possible to have two ports associated to the same interface. In the general case, we assume that multiple clients can connect to a provided port and a component instance can connect to multiple servers via a required port.</p>
+</div>
+<div class="paragraph">
+<p>The dependencies among the interfaces of the ports in the component are defined in component <em>functional constraints</em>. Furthermore, components may have <em>time and data constraints</em> expressed in the same syntax as the ones for interfaces. The general syntax of component models is given below:</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>import "interface1.interface"
+import "interface2.interface"
+//... other imports
+
+component componentName
+
+provided port IInterface1 port1 //port interface and port name
+required port IInterface2 port2
+//... other ports</pre>
+</div>
+</div>
+<div class="paragraph">
+<p><span class="maroon">functional constraints</span></p>
+</div>
+<div class="paragraph">
+<p>Optional <a href="#fconstraint">functional constraints</a></p>
+</div>
+<div class="paragraph">
+<p><span class="maroon">timing constraints</span></p>
+</div>
+<div class="paragraph">
+<p>Optional <a href="#tdconstraints">timing constraints</a></p>
+</div>
+<div class="paragraph">
+<p><span class="maroon">data constraints</span></p>
+</div>
+<div class="paragraph">
+<p>Optional <a href="#tdconstraints">data constraints</a></p>
+</div>
+<div class="paragraph">
+<p>The important new construct here is <em>functional constraint</em>. It will be explained on the basis of a simple example.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_example"><a class="anchor" href="#_example"></a>Example</h3>
+<div class="paragraph">
+<p>The example uses a hypothetical component that is capturing micro images of materials in a controlled environment with required temperature and presence of vacuum. Each of the three aspects of image capturing, setting the temperature and the vacuum is controlled via a separate interface: IImaging, ITemperature and IVacuum respectively.</p>
+</div>
+<div class="paragraph">
+<p>IImaging defines commands for preparing and creating images. IVacuum defines commands for enabling/disabling vacuum (vacuum On and Off). ITemperature defines commands for setting the temperature at certain level and resetting the temperature level. All interfaces send notifications as an indication of successful execution.</p>
+</div>
+<div class="paragraph">
+<p>The following table gives the state machines of these interfaces:</p>
+</div>
+<table class="tableblock frame-all grid-all stretch">
+<colgroup>
+<col style="width: 33.3333%;">
+<col style="width: 33.3333%;">
+<col style="width: 33.3334%;">
+</colgroup>
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top">ITemperature</th>
+<th class="tableblock halign-left valign-top">IVacuum</th>
+<th class="tableblock halign-left valign-top">IImaging</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="../img/ITemperature.png" alt="image"></span></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="../img/IVacuum.png" alt="image"></span></p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock"><span class="image"><img src="../img/IImaging.png" alt="image"></span></p></td>
+</tr>
+</tbody>
+</table>
+<div class="paragraph">
+<p>The component satisfies the following requirements regarding the interaction among the three interfaces:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Creating an image is possible only if the vacuum is present and the requested temperature is reached</p>
+</li>
+<li>
+<p>Setting the temperature is possible only if the vacuum is present</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>These two requirements will be expressed as component functional constraints. The goal of a functional constraint is to capture only an aspect of the total behavior of the component. Component models are not expected to define the complete component behavior in terms of reactions to all possible commands in different states. In other words, component models are not design specifications that are used to derive an implementation. An implementation of a component is expected to satisfy all the functional constraints defined in a component model along with the time and data constraints.</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>import "IImaging.interface"
+import "ITemperature.interface"
+import "IVacuum.interface"
+
+component Imaging
+
+provided port IImaging iImagPort
+provided port ITemperature iTempPort
+provided port IVacuum iVacPort
+
+functional constraints
+...</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>One example functional constraint is explained in the next section.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_functional_constraints"><a class="anchor" href="#_functional_constraints"></a><span id="fconstraint">Functional</span> Constraints</h3>
+<div class="paragraph">
+<p>We distinguish between <em>state-based</em> and <em>predicate</em> functional constraints. The first kind is a state-based specification of behavior using a subset of the union of all events that can be observed on all the component ports. The second kind is a Boolean expression that has to be true every time the component receives or sends a message.</p>
+</div>
+<div class="paragraph">
+<p>Component monitoring process checks if all functional constraints hold for a set of traces. The process of checking a functional constraint is done in parallel with interface monitoring, that is, a check if the given trace satisfies all the interfaces at the component ports. This means that the information about the port state is available during the check of a functional constraint (which syntax construct is used for this is explained shortly). The monitoring of component ports follows the principles of <a href="../monitoring/monitoring.html#singleton_multiton_monitoring">interface monitoring</a>. In particular, a port associated to multiton interface is monitored by creating a monitor for each connection. A port of singleton interface uses a single monitor for all the connections.</p>
+</div>
+<div class="sect3">
+<h4 id="_state_based_functional_constraints"><a class="anchor" href="#_state_based_functional_constraints"></a>State-based Functional Constraints</h4>
+<div class="paragraph">
+<p>The example below is a state-based functional constraint that implements the first requirement: imaging is possible only if the vacuum is present and a target temperature is set. We also temporarily assume that the ports have a single client.</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>ImagingConstraint {
+    use events
+    command iImagPort::CreateImage
+    iImagPort::reply to command CreateImage
+
+    initial state Status {
+        command iImagPort::CreateImage where iVacPort in Vacuum and iTempPort in TemperatureSet
+        iImagPort::reply(Result::Ok) to command CreateImage
+        next state: Status
+
+        command iImagPort::CreateImage where not iVacPort in Vacuum or not iTempPort in TemperatureSet
+        iImagPort::reply(Result::NotAvailable) to command CreateImage
+        next state: Status
+    }
+}</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>The constraint named 'ImagingConstraint' first declares which events will be used (clause 'use events'). In the example we are interested in two events only: command CreateImage and its reply. As can be seen all events are prefixed with the ports at which they are observed. This is needed for name disambiguation because an interface can be associated to more than one port. Events that are not declared in this clause cannot be used in the constraint.</p>
+</div>
+<div class="paragraph">
+<p>Generally a state-based constraint is given as a state machine with exactly one initial state. Transitions are sequences of actions where the first action is an <em>event reception</em>: an indication that an event is expected to be observed. In the example we have only one state with two transitions. The intention behind the specification is that if the command CreateImage is received under the correct conditions the reply gives the value OK (the first transition). Otherwise the reply returns value NotAvailable (second transition).</p>
+</div>
+<div class="paragraph">
+<p>An event reception may have an optional boolean expression as a condition after the keyword <em>where</em>. The reception is successful if the event is observed in the trace and the condition is true. The example condition shows how functional constraints use information about the state of the interface at a given port. The general syntax is <em>portName in stateName</em>. State <em>Vacuum</em> indicates that the vacuum is properly set, state <em>TemperatureSet</em> indicates the desired temperature is established. This access to interface state information is extremely handy. Without it, the functional constraint should trace the sequence of the events in the other two interfaces, a task that is often performed by the interface specs and the interface monitor. This way, code duplication is avoided and the size of the constraint is reduced.</p>
+</div>
+<div class="paragraph">
+<p>Informally, the semantics of a state-based functional constraint is as follows. For a given trace, first a projection is made by eliminating all the events not listed in the 'use events'. Then starting from the initial state and the first event in the trace, a transition traversal path is searched that accepts the trace. Each transition accepts a fragment of the trace by executing the actions in its body. Recall that a transition always starts with an event reception. Transitions are tried in the order of their appearance in the state. When an event reception action is executed it has to match the current observed event and the condition must be true (if present) in case of match. If the head event reception of a transition matches the event, then the transition is taken. Otherwise the next one is tried. If no transition is taken, a functional constraint monitoring error is generated. If a transition is taken then all the executed event reception actions in its body must succeed on the subsequently observed events until the move to the next state is done. Please note that if an event reception fails after the transition is selected then the whole transition fails, the next one is not tried and a monitoring error is given.</p>
+</div>
+<div class="paragraph">
+<p>The full details on the syntax of <em>use events</em> clause, event receptions, and the allowed actions in the transition bodies are given in the subsequent appendix.</p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_predicate_functional_constraints"><a class="anchor" href="#_predicate_functional_constraints"></a>Predicate Functional Constraints</h4>
+<div class="paragraph">
+<p>As an example of predicate functional constraint we will give a different interpretation and implementation of the same requirement as before. We will require that if port iImagPort is in state Imaging then iTempPort is in state TemperatureSet and iVacPort is in state Vacuum.</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>ImagingConstraint_Predicate
+    always
+    not iImagPort in Imaging or
+    (iTempPort in TemperatureSet and iVacPort in Vacuum)</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>The meaning of this functional constraint is that whenever an event is observed at any component port, the boolean expression after 'always' must evaluate to true.</p>
+</div>
+<div class="paragraph">
+<p>Please note that the two example constraints are not equivalent in terms of the set of traces that satisfy them. The first constraint strictly requires reply(OK) to command CreateImage if the temperature and vacuum ports are in the required states whereas the second constraint allows reply(NotAvailable) to be sent under the same conditions. If however, iImagPort enters state Imaging (which is only possible if reply(OK) is observed) then the temperature and vacuum ports must be in the required states.</p>
+</div>
+<div class="paragraph">
+<p>Another important subtlety is how the state of a port is determined. In this example we assumed a single client per port meaning that a single interface monitor will be created per port thus the port states are uniquely determined. However, the general case is multiple connections per port leading to possibly different states per connection on the same port. Next section explains the language constructs that give fine grained access to port connection states.</p>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_identification_and_quantification_over_port_connections"><a class="anchor" href="#_identification_and_quantification_over_port_connections"></a>Identification and Quantification over Port Connections</h3>
+<div class="paragraph">
+<p>As already mentioned, we generally assume that multiple communication parties can be connected to a port. For a provided port these are the clients of the component. For a required port these are the servers used by the component. A given event observed at a given port is always associated to a communication party. It is possible to capture the identity of this party in a variable and to use it in expressions. Furthermore, during component monitoring, an instance of the port&#8217;s interface is created for every connection to or from the port. This gives the possibility to obtain the current interface state at a given port for a given connection. Based on this information, the CommaSuite component language provides a number of expressions that quantify over the connections at a given port stating, for example, that all or some connections are in a given interface state. We will illustrate these expressions on the basis of an example.</p>
+</div>
+<div class="paragraph">
+<p>As an example, consider a component that provides a hypothetical resource to its clients via an interface IResource. Multiple clients can request control over the resource. The component is responsible for implementing a policy for sharing the resource among multiple clients. In our example, the component will allow at most one client at a time to be in control of the resource. The following is the definition of the IResource interface:</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>interface IResource
+
+machine Main {
+    initial state Idle {
+        transition trigger: getControl
+            do: reply(true)
+            next state: InControl
+        OR
+            do: reply(false)
+            next state: Idle
+    }
+
+    state InControl {
+        //... do something with the resource
+        transition do: controlLost
+            next state: Idle
+    }
+}</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Here is a snippet of the component definition with two functional constraints that use constructs for identification and quantification of connections.</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>component ResourceControl
+
+provided port IResource resPort
+//other ports
+//...
+
+functional constraints
+
+FC1 {
+    use events
+    resPort::reply to command getControl
+    notification resPort::controlLost
+
+    variables
+    id c
+    id c1
+
+    initial state ResourceFree {
+        &lt;c&gt; resPort::reply(true) to command getControl
+        next state: ResourceTaken
+
+        resPort::reply(false) to command getControl
+        next state: ResourceFree
+    }
+
+    state ResourceTaken {
+        notification &lt;c1&gt;resPort::controlLost where c == c1
+        next state: ResourceFree
+
+        resPort::reply(false) to command getControl
+        next state: ResourceTaken
+    }
+}
+
+FC2
+always [0-1] connections at portRes in InControl</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Functional constraint FC1 is state-based. If in the initial state ResourceFree a reply to command getControl with argument true is observed then the identifier of the client who receives the reply is bound to the variable <em>c</em>. Note the type of the variable: <em>id</em>. This is a predefined primitive type used only in component definitions. It allows only identity comparison operations.</p>
+</div>
+<div class="paragraph">
+<p>If a client receives a positive reply to the getControl request the state ResourceTaken becomes the current state of the FC1 machine. In this state no more positive replies to control requests are allowed. The control over the resource can be released only if the component decides to sent notification controlLost to the client which currently has the control. Observe the usage of the variable c1 that captures the identity of the receiver of the notification. It is used in the condition that ensures that the client which is currently in control receives the notification.</p>
+</div>
+<div class="paragraph">
+<p>The logic in FC1 can be expressed more compactly as a predicate constraint. During component monitoring, the state information of each client of port resPort is available. The requirement is that at most one client is in the interface state InControl. Constraint FC2 shows the corresponding expression. It uses a quantifier over the port connections (zero or one connection satisfies a condition). The syntax of the possible quantifiers is given in the appendix.</p>
+</div>
+<div class="paragraph">
+<p>It should be noted that this example shows how component functional constraints can restrict the order of events over the connections of a single port. In contrast, the first example (about imaging, vacuum and temperature) involves multiple ports and interfaces.</p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_time_and_data_constraints"><a class="anchor" href="#_time_and_data_constraints"></a><span id="tdconstraints">Time and Data Constraints</span></h3>
+<div class="paragraph">
+<p>Similarly to interface specifications, component models may have time and data constraints. The main difference is that events belonging to different interfaces or observed at different ports can be used. For example, a time constraint may specify that receiving a request at a provided port is followed within a certain interval by an outgoing request at a required port.</p>
+</div>
+<div class="paragraph">
+<p>The syntax of the constraints remains the same as in interface specifications with two exceptions:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>all events must be prefixed with their ports</p>
+</li>
+<li>
+<p>events cannot be assigned with states in which they are expected to occur. <em>Note:</em> in case of interface specification, states refer to interface states. In component models, there are no component states. The possibility to refer to the port states is under investigation and may be included in a future version of the CommaSuite framework.</p>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_appendix_functional_constraints_syntax"><a class="anchor" href="#_appendix_functional_constraints_syntax"></a>Appendix: Functional Constraints Syntax</h3>
+<div class="paragraph">
+<p>The syntax of state-based functional constraints has the following general structure:</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>constraintName {
+   use events
+   one or more event patterns
+
+   variables
+   optionally, declaration of variables
+
+   init
+   optionally, initialization of variables
+
+   initial state S{
+      //transition
+      eventReception //first action
+      ...other actions
+      next state: stateName
+
+      //... other transitions
+   }
+
+   //other states (optional)
+   state P{
+      //... transitions
+   }</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>The syntax of predicate functional constraint is:</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>constraintName
+always boolean_expression</pre>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_use_events_patterns"><a class="anchor" href="#_use_events_patterns"></a><span id="useevents">Use</span> Events Patterns</h4>
+<div class="paragraph">
+<p>List of event patterns. Every pattern denotes a non-empty set of events. Patterns are one of:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Single event: (<strong>command</strong> | <strong>signal</strong> | <strong>notification</strong>) portName::eventName</p>
+</li>
+<li>
+<p>Reply on a given port. Can denote replies to multiple commands: portName::<strong>reply</strong></p>
+</li>
+<li>
+<p>Reply to a concrete command: portName::<strong>reply to command</strong> commandName</p>
+</li>
+<li>
+<p>Wildcard for events per kind: <strong>any</strong> portName::(<strong>command</strong> | <strong>signal</strong> | <strong>notification</strong>)</p>
+</li>
+<li>
+<p>Wildcard that denotes all events: <strong>any</strong> portName::<strong>event</strong></p>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_event_receptions_and_actions"><a class="anchor" href="#_event_receptions_and_actions"></a><span id="actions">Event Receptions and Actions</span></h4>
+<div class="paragraph">
+<p>Event receptions indicate that an event is expected to be observed subject of an optional condition. The syntax is:</p>
+</div>
+<div class="paragraph">
+<p><em>EventPattern</em> (<strong>where</strong> <em>booleanExpression</em>)?</p>
+</div>
+<div class="paragraph">
+<p>Event pattern is one of:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>(<strong>command</strong> | <strong>signal</strong> | <strong>notification</strong>) (&lt;<em>var</em>&gt;)? portName::eventName(<em>expr1</em>, <em>expr2</em>, &#8230;&#8203;). The number and type of expressions must match the parameters in the event definition given in the interface signature. If an expression is a variable and the observed event matches the pattern then the actual observed parameter value is assigned to the variable and can be used later, for example, in the condition. If the expression is not a variable, it is evaluated and the value must match the observed value ('*' is allowed as a value like in interface specifications).</p>
+</li>
+<li>
+<p>(&lt;<em>var</em>&gt;)? portName::<strong>reply</strong>(expr1, expr2, &#8230;&#8203;) (<strong>to command</strong> commandName)?</p>
+</li>
+<li>
+<p><strong>any</strong> (&lt;<em>var</em>&gt;)? portName::(<strong>command</strong> | <strong>signal</strong> | <strong>notification</strong>)</p>
+</li>
+<li>
+<p><strong>any</strong> (&lt;<em>var</em>&gt;)? portName::<strong>event</strong></p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>The check if an observed event matches the pattern is similar to the matching in time and data constraints. The port, event kind and name have to be the same. Parameter values must match with the exception of variables (explained earlier). In case of successful match the variables in the pattern are assigned with the observed value. The optional condition is evaluated after a successful match.</p>
+</div>
+<div class="paragraph">
+<p>The allowed actions in transitions are a subset of the ones used in interface specifications plus event reception:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>event reception (explained above)</p>
+</li>
+<li>
+<p>assignment, including assignment of record fields</p>
+</li>
+<li>
+<p><strong>if-then-else</strong> with the limitation that event receptions cannot be used inside it</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>Note that the <strong>any order</strong> construct is not allowed in functional constraints. It can possibly be included in a future version of the CommaSuite framework.</p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_quantifiers_over_port_connections"><a class="anchor" href="#_quantifiers_over_port_connections"></a><span id="actions">Quantifiers over Port Connections</span></h4>
+<div class="ulist">
+<ul>
+<li>
+<p><em>var</em> <strong>at</strong> <em>port</em> <strong>in</strong> (<em>state</em> | {<em>states, &#8230;&#8203;</em>}). Evaluates to true if the value of <em>var</em> denotes an existing communication party that is connected to the given port and this connection is in the given state (or in one of the given states). Remark: if the port is provided port of singleton interface then the result is the same for all existing communication parties since all connections share the monitor.</p>
+</li>
+<li>
+<p><strong>all</strong> <strong>at</strong> <em>port</em> <strong>in</strong> (<em>state</em> | {<em>states, &#8230;&#8203;</em>}). Evaluates to true if all the connections at the given port are in one of the given states. Note that if no connections exist at the time of evaluation the value is vacuously true.</p>
+</li>
+<li>
+<p><strong>some</strong> <strong>at</strong> <em>port</em> <strong>in</strong> (<em>state</em> | {<em>states, &#8230;&#8203;</em>}). Evaluates to true if at least one connection at the given port is in one of the given states.</p>
+</li>
+<li>
+<p><strong>one</strong> <strong>at</strong> <em>port</em> <strong>in</strong> (<em>state</em> | {<em>states, &#8230;&#8203;</em>}). Evaluates to true if exactly one connection at the given port is in one of the given states.</p>
+</li>
+<li>
+<p>[m-n] <strong>connections</strong> <strong>at</strong> <em>port</em> <strong>in</strong> (<em>state</em> | {<em>states, &#8230;&#8203;</em>}). Evaluates to true if between m and n connections at the given port are in one of the given states.</p>
+</li>
+<li>
+<p><em>port</em> <strong>in</strong> <em>state</em>. Evaluates as follows:</p>
+<div class="ulist">
+<ul>
+<li>
+<p>if there is already at least one connection established over the port, the expression is an abbreviation of <strong>all</strong> <strong>at</strong> <em>port</em> <strong>in</strong> <em>state</em></p>
+</li>
+<li>
+<p>if no connections are present yet on the port, the expression evaluates to true if the state is an initial state of a machine in the port&#8217;s interface</p>
+</li>
+</ul>
+</div>
+</li>
+</ul>
+</div>
+</div>
+</div>
+</div>
+</div>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/site/download.html b/site/language/data_constraints.html
similarity index 75%
copy from site/download.html
copy to site/language/data_constraints.html
index 1bafd3b..7ede869 100644
--- a/site/download.html
+++ b/site/language/data_constraints.html
@@ -441,104 +441,98 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="language.html">Language</a><ul class="sectlevel4"><li><a style="" href="types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="font-weight: bold" href="data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../tutorial/intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="../tutorial/preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../tutorial/serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_data_constraints"><a class="anchor" href="#_data_constraints"></a>Data Constraints</h2>
 <div class="sectionbody">
+<div class="paragraph normal">
+<p>Data constraints impose conditions on the parameter values in observed events. The intuition behind data constraints is: if a sequence of events is observed then a condition over the observed parameters is satisfied.</p>
+</div>
 <div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
+<p>Events have the same syntax as the events in timing constraints. In addition, event parameters can be variables that are bound to actual values when the event is observed.</p>
+</div>
+<div class="paragraph">
+<p>Below is the general structure of data constraints specifications:</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>data constraints
+
+variables
+
+//Variable declarations
+Type1 VariableName1
+Type2 VariableName2
+...
+
+//Constraints with the following general structure
+
+constraintName step1; step2; ... ; step_n where condition_boolean_expression</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>A step can be one of the following:</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
+<p>event, e.g. <span class="maroon"><strong>notification</strong></span> Done</p>
 </li>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
+<p><span class="maroon"><strong>no</strong></span>[event]: a negation of event, e.g. <span class="maroon"><strong>no</strong></span>[<strong>command</strong> putMoney]<br>
+<em>matches an observed event if it is different than the negated event</em></p>
 </li>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
-</li>
-</ul>
-</div>
-</li>
-<li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
-</li>
-<li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
-</li>
-</ol>
-</div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
-</div>
-<div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
-<div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
-<div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
-<div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
-</li>
-<li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
-</li>
-<li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
-</li>
-<li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
+<p>body (event or negation of event) <span class="maroon"><strong>until</strong></span> stop condition (event or negation of event): repetition of events until a given event is observed<br>
+<em>matches a sequence of observed events in which the last one matches the stop condition and the preceding (possibly none) events match the body</em></p>
 </li>
 </ul>
 </div>
 <div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
+<p>This is an example of a data constraint that checks if the reply to a command has the same parameter value as the first command parameter:</p>
 </div>
+<div class="paragraph">
+<p><code><span class="maroon">command</span> A(X, *); <span class="maroon">any event until reply</span>(Y) <span class="maroon">where</span> X == Y</code></p>
+</div>
+<div class="paragraph">
+<p>For a more complex example, consider a component that provides communication channels to its clients. Channels have a given bandwidth. Clients can request a communication channel by sending asynchronously the signal <strong>openChannel</strong> with the desired bandwidth as a parameter. The component tries to open the channel and notifies the client by sending a notification <strong>channelStatus</strong> with two parameters: a boolean value that indicates the success/failure of the channel opening action and the actual bandwidth. A requirement on this protocol is that in case of success, the reported bandwidth must be the same as the requested bandwidth. In addition, while trying to open the channel, the component may continue receiving commands and signals and sending notifications.</p>
+</div>
+<div class="paragraph">
+<p>The stated requirement can be formulated as the following data constraint rule:</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>data constraints
+
+variables
+
+int requestedBandwidth //variable to be bound to the value of the requested bandwidth
+int confirmedBandwidth //variable to be bound to the value of the confirmed bandwidth
+bool status //variable to be bound to the status of the request
+
+bandwidthEquality //name of the data constraint
+signal openChannel(requestedBandwidth); //if the signal is observed
+                                        //the parameter value is assigned to variable requestedBandwidth
+any event                               //any event may occur while waiting for confirmation
+until
+channelStatus(status, confirmedBandwidth) //this event marks the end of the searched sequence of events
+where
+
+//the condition is equivalent to: if status is true then the bandwidth values are equal
+//stated more formally: status =&gt; (requestedBandwidth == confirmedBadwidth)
+//since the CommaSuite framework does not support implication, we use the well known equivalence:
+//(G =&gt; F) &lt;=&gt; (NOT G OR F)
+
+(NOT status)
+OR
+(requestedBandwidth == confirmedBandwidth)</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Similarly to time constraints, an optional <strong>when</strong> condition can be used in the events provided that the data constraint is defined in an interface definition. Note that interface variables that are allowed in the <strong>when</strong> condition cannot be used in the <strong>where</strong> condition.</p>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/language/expressions.html
similarity index 73%
copy from site/download.html
copy to site/language/expressions.html
index 1bafd3b..589bb15 100644
--- a/site/download.html
+++ b/site/language/expressions.html
@@ -441,103 +441,177 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="language.html">Language</a><ul class="sectlevel4"><li><a style="" href="types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="font-weight: bold" href="expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../tutorial/intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="../tutorial/preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../tutorial/serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_statements_and_expressions"><a class="anchor" href="#_statements_and_expressions"></a>Statements and Expressions</h2>
 <div class="sectionbody">
-<div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
+<div class="paragraph normal">
+<p>Statements are used in the bodies of transitions and in initialization sections. The following statements are supported:</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
+<p>Assignment: <code>Variable := Expression</code></p>
+</li>
+<li>
+<p>Record field assignment: <code>RecordExpression.field := Expression</code>. Example: <code>person.name = "John"</code></p>
+</li>
+<li>
+<p>If-Then-Else:</p>
 <div class="ulist">
 <ul>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
+<p><code><span class="maroon">if</span> BooleanExpression <span class="maroon">then</span> Statements <span class="maroon">else</span> Statements <span class="maroon">fi</span></code></p>
 </li>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
+<p><code><span class="maroon">if</span> BooleanExpression then Statements <span class="maroon">fi</span></code></p>
 </li>
 </ul>
 </div>
 </li>
 <li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
+<p>Reply to command: <code><span class="maroon">reply</span>(Expression)</code> or <code><span class="maroon">reply</span></code> if no return value is expected</p>
 </li>
 <li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
-</li>
-</ol>
-</div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
+<p>Sending notification: <code>NotificationName(Expression1, Expression2, &#8230;&#8203;)</code></p>
 </li>
 </ul>
 </div>
 <div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
+<h3 id="_expressions"><a class="anchor" href="#_expressions"></a>Expressions</h3>
+<div class="sect3">
+<h4 id="_basic_types_enumerations_and_bulkdata"><a class="anchor" href="#_basic_types_enumerations_and_bulkdata"></a>Basic Types, Enumerations and Bulkdata</h4>
+<div class="ulist">
+<ul>
+<li>
+<p>Numbers (integers and reals): <code>1, 23.0, -1, -10.2, 2.0e-2</code></p>
+</li>
+<li>
+<p>Strings: <code>"This is a string"</code></p>
+</li>
+<li>
+<p>Booleans: <code><span class="maroon">true</span>, <span class="maroon">false</span></code></p>
+</li>
+<li>
+<p>Bulkdata values: <code><span class="maroon">Bulkdata</span>&lt;1024&gt;, <span class="maroon">Bulkdata</span>&lt;&gt;</code></p>
+</li>
+<li>
+<p>Enumeration literals: <code>EnumTypeName::Literal</code>, e.g. <code>Status::On</code></p>
+</li>
+</ul>
+</div>
 <div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
-<div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
-<div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
+<p>Operations:</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
+<p>Boolean operators: <code>AND, OR, NOT</code></p>
 </li>
 <li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
+<p>Comparators: `&lt;, &gt;, &#8656;, &gt;=, ==, != `</p>
 </li>
 <li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
+<p>Arithmetics: <code>+, -, *, /, mod, min, max, ^</code></p>
 </li>
 <li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
+<p>Predefined functions: <code>abs(Expr), asReal(Expr), length(BulkdataExpr)</code></p>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_records"><a class="anchor" href="#_records"></a>Records</h4>
+<div class="ulist">
+<ul>
+<li>
+<p>Records: <code>RecordTypeName{fieldsName = Expression, &#8230;&#8203;}</code>, e.g. <code>Person{firstName = "John", lastName = "Smith"}</code></p>
+</li>
+<li>
+<p>Record field access: <code>RecordExpression.fieldName</code></p>
 </li>
 </ul>
 </div>
 <div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
+<p>Using the <em>any value</em> (*) is possible for fields in records but only if the record is used as a value in event:</p>
+</div>
+<div class="paragraph">
+<p><code>reply(Result{flag = true, someOtherField = *})</code></p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_vectors"><a class="anchor" href="#_vectors"></a>Vectors</h4>
+<div class="paragraph">
+<p>Vectors: <code>&lt;TypeName&gt;[element1, element2, &#8230;&#8203;]</code>, e.g. <code>&lt;int[]&gt;[], &lt;string[][]&gt;[&lt;string[]&gt;["John", "Smith"], &lt;string[]&gt;["John", "Doe"]]</code></p>
+</div>
+<div class="paragraph">
+<p>Operations:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Quantifiers:</p>
+<div class="ulist">
+<ul>
+<li>
+<p><code><span class="maroon">exists</span>(Variable_decl <span class="maroon">in</span> VectorExpr : BooleanExpr)</code></p>
+</li>
+<li>
+<p><code><span class="maroon">forAll</span>(Variable_decl <span class="maroon">in</span> VectorExpr : BooleanExpr)</code></p>
+</li>
+</ul>
+</div>
+</li>
+<li>
+<p>Predefined functions: <code>isEmpty(VectorExpr), size(VectorExpr), contains(VectorExpr, Expr), add(VectorExpr, Expr), delete(Variable_decl in VectorExpr : BooleanExpr)</code></p>
+</li>
+</ul>
+</div>
+<div class="sect4">
+<h5 id="_changing_the_content_of_vectors"><a class="anchor" href="#_changing_the_content_of_vectors"></a>Changing the content of vectors</h5>
+<div class="paragraph">
+<p>In order to mutate a vector by adding a new element in its end use the following:</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>persons := add(persons, "John")</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>In this example, the predefined function <em>add</em> returns a new vector without changing the argument <em>persons</em>. In order to update the value of <em>persons</em> use the expression in an assignment statement.</p>
+</div>
+<div class="paragraph">
+<p>Function <em>delete</em> removes vector elements that satisfy a given condition. The result is a vector without those elements:</p>
+</div>
+<div class="paragraph">
+<p><code>persons := delete(string p <span class="maroon">in</span> persons : p == "John")</code></p>
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_maps"><a class="anchor" href="#_maps"></a>Maps</h4>
+<div class="paragraph">
+<p>Maps: <code>&lt;Type&gt;{key &#8594; value, key &#8594; value, &#8230;&#8203;}</code>, e.g. <code>&lt;map&lt;int, int[]&gt;&gt;{1 &#8594; &lt;int[]&gt;[], 2 &#8594; &lt;int[]&gt;[0]}</code></p>
+</div>
+<div class="paragraph">
+<p>Operations:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>map update: <code>MapExpr[keyExpr &#8594; valueExpr]</code>. Returns a new map that is the update of MapExpr with the given (key, value) pair. MapExpr is unaltered.</p>
+</li>
+<li>
+<p>map read: <code>MapExpr[keyExpr]</code>. Returns the value associated to the keyExpr. If the keyExpr does not exist as a key in the map, the default value for the map value type is returned. MapExpr remains unchanged.</p>
+</li>
+<li>
+<p>Predefined functions: <code>hasKey(MapExpr, KeyExpr), deleteKey(MapExpr, KeyExpr)</code>: returns a new map derived from MapExpr by removing the KeyExpr key and its associated value (MapExpr is unchanged).</p>
+</li>
+</ul>
+</div>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/language/generic_constraints.html
similarity index 83%
copy from site/download.html
copy to site/language/generic_constraints.html
index 1bafd3b..3882651 100644
--- a/site/download.html
+++ b/site/language/generic_constraints.html
@@ -441,104 +441,18 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="language.html">Language</a><ul class="sectlevel4"><li><a style="" href="types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="font-weight: bold" href="generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../tutorial/intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="../tutorial/preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../tutorial/serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_generic_constraints"><a class="anchor" href="#_generic_constraints"></a>Generic Constraints</h2>
 <div class="sectionbody">
-<div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
-</li>
-</ul>
-</div>
-</li>
-<li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
-</li>
-<li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
-</li>
-</ol>
-</div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
-</div>
-<div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
-<div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
-<div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
-<div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
-</li>
-<li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
-</li>
-<li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
-</li>
-<li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
-</li>
-</ul>
+<div class="paragraph normal">
+<p>Generic constraints treat data parameters and time stamps uniformly. In the CommaSuite framework, time and data constraints are translated to generic constraints and then evaluated. This is transparent to the user.</p>
 </div>
 <div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
-</div>
+<p>Users should always try first to express a constraint as a time or data constraint. If this is not possible due to limited expressive power then generic constraints can be used.</p>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/language/interfaces.html
similarity index 80%
copy from site/download.html
copy to site/language/interfaces.html
index 1bafd3b..26007c1 100644
--- a/site/download.html
+++ b/site/language/interfaces.html
@@ -441,103 +441,87 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="language.html">Language</a><ul class="sectlevel4"><li><a style="" href="types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="font-weight: bold" href="interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../tutorial/intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="../tutorial/preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../tutorial/serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_interface_signatures"><a class="anchor" href="#_interface_signatures"></a>Interface Signatures</h2>
 <div class="sectionbody">
-<div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
+<div class="paragraph normal">
+<p>Signatures are defined in files with extension '.signature'. A signature model may optionally:</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
+<p>import existing <a href="types.html">type models</a></p>
+<div class="literalblock">
+<div class="content">
+<pre>import "myTypes.types"</pre>
+</div>
+</div>
 </li>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
+<p>define new <a href="types.html">types</a> visible only in the interface model.</p>
 </li>
 </ul>
 </div>
-</li>
-<li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
-</li>
-<li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
-</li>
-</ol>
-</div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
-</div>
-<div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
 <div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
+<p>An example signature:</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>signature myFirstInterface</pre>
 </div>
 </div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
 <div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
+<p>Optionally, define local <a href="types.html">types</a>, for instance,</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>types // local to this interface
+   type Command
+   type MyType
+   vector Requests = Command []</pre>
 </div>
 </div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
 <div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
+<p>Optionally define</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
+<p>Commands: synchronous input calls that require a reply possibly with a value. The caller is blocked until the reply is received</p>
 </li>
 <li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
+<p>Signals: asynchronous input calls, no reply is required. The caller is not blocked.</p>
 </li>
 <li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
-</li>
-<li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
+<p>Notifications: asynchronous output - not blocking.</p>
 </li>
 </ul>
 </div>
 <div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
+<p>The example below contains all three parts; note that commands start with the type of the return value. Commands may have <span class="maroon"><strong>in</strong></span>, <span class="maroon"><strong>inout</strong></span>, and <span class="maroon"><strong>out</strong></span> parameters. When the direction is not explicitly given <span class="maroon"><strong>in</strong></span> is assumed as default. Signals and notifications can only have <span class="maroon"><strong>in</strong></span> parameters.</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>commands
+   Time CurrentTime ( Status st, string info, out bool error )
+   string Command (Request req, inout int result)
+   void Null
+   int Reset
+   real Value (in int something)
+
+signals
+   start (real val)
+   doIt (in Request req)
+   go
+
+notifications
+   myState (Status s)
+   error
+   no</pre>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/language/language.html
similarity index 82%
copy from site/download.html
copy to site/language/language.html
index 1bafd3b..2c4e037 100644
--- a/site/download.html
+++ b/site/language/language.html
@@ -441,104 +441,57 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="font-weight: bold" href="language.html">Language</a><ul class="sectlevel4"><li><a style="" href="types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../tutorial/intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="../tutorial/preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../tutorial/serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_the_commasuite_language"><a class="anchor" href="#_the_commasuite_language"></a>The CommaSuite language</h2>
 <div class="sectionbody">
-<div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
+<div class="paragraph normal">
+<p>General remarks:</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
+<p>Comments can be inserted after "<span class="green">//</span>" or between "<span class="green">/* &#8230;&#8203; */</span>". When a comment "<span class="green">/* Text */</span>" is placed before a definition (e.g., of a state or a type) then this Text is shown when hovering above a use of the definition (e.g., state name of name of the type).</p>
 </li>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
+<p>The <em>escape</em> character is '^'. It should be used before names that duplicate CommaSuite keywords, e.g. ^type.</p>
 </li>
 </ul>
 </div>
-</li>
-<li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
-</li>
-<li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
-</li>
-</ol>
-</div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
-</div>
-<div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
 <div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
-<div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
-<div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
+<p>Main ingredients:</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
+<p><a href="types.html">Types</a></p>
 </li>
 <li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
+<p><a href="interfaces.html">Signatures</a></p>
 </li>
 <li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
+<p><a href="statemachines.html">Interfaces</a></p>
 </li>
 <li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
+<p><a href="components.html">Components</a></p>
 </li>
 </ul>
 </div>
 <div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
+<p>Additional information:</p>
 </div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="expressions.html">CommaSuite expressions</a></p>
+</li>
+<li>
+<p><a href="comments.html">Documenting CommaSuite models</a></p>
+</li>
+</ul>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/language/statemachines.html
similarity index 76%
copy from site/download.html
copy to site/language/statemachines.html
index 1bafd3b..41c666f 100644
--- a/site/download.html
+++ b/site/language/statemachines.html
@@ -441,103 +441,119 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="language.html">Language</a><ul class="sectlevel4"><li><a style="" href="types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="font-weight: bold" href="statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../tutorial/intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="../tutorial/preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../tutorial/serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_interfaces"><a class="anchor" href="#_interfaces"></a>Interfaces</h2>
 <div class="sectionbody">
-<div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
-</li>
-</ul>
-</div>
-</li>
-<li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
-</li>
-<li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
-</li>
-</ol>
-</div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
+<div class="paragraph normal">
+<p>An interface model (stored in a file with extension '.interface') defines the interface behavior and starts by importing the interface signature. The interface name has to be the same as the name given in the signature definition. Next, the interface model may optionally contain global variables and their initial values. The model then defines a number of state machines.</p>
 </div>
 <div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
+<h3 id="_general_structure_of_interface_definition"><a class="anchor" href="#_general_structure_of_interface_definition"></a>General Structure of Interface Definition</h3>
 <div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
+<p>The following is an example of the general structure, where the file "interfaceSignature.signature" contains the signature:</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>import "interfaceSignature.signature"</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>interface declaration with name, optional version, and optional indicator for <a href="#singleton_vs_multiton">singleton</a> interface:</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>singleton interface interfaceName version "1.0"  //version is optional
+
+variables
+
+bool aGlobalVariable
+bool error
+int code
+
+init
+aGlobalVariable := true
+error := false
+code := 0
+
+event fragments</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>optional <a href="transitions.html#eventfragment">event fragment definitions</a></p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>machine first {</pre>
+</div>
+</div>
+<div class="paragraph">
+<p><a href="states.html">States</a> and <a href="transitions.html">transitions</a></p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>}
+
+machine second {</pre>
+</div>
+</div>
+<div class="paragraph">
+<p><a href="states.html">States</a>, and <a href="transitions.html">transitions</a></p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>}</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>The sets of events used in the state machines (commands, signals, notifications) must be disjoint. Nested state machines are not supported.</p>
+</div>
+<div class="paragraph">
+<p>Optionally, a number of constraints can be specified. Constraints can be:</p>
+</div>
+<div class="paragraph">
+<p><span class="maroon">timing constraints</span></p>
+</div>
+<div class="paragraph">
+<p><a href="timing_constraints.html">Timing constraints</a></p>
+</div>
+<div class="paragraph">
+<p><span class="maroon">data constraints</span></p>
+</div>
+<div class="paragraph">
+<p><a href="data_constraints.html">Data constraints</a></p>
+</div>
+<div class="paragraph">
+<p><span class="maroon">generic constraints</span></p>
+</div>
+<div class="paragraph">
+<p><a href="generic_constraints.html">Generic constraints</a></p>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
+<h3 id="_singleton_and_multiton_interfaces"><a class="anchor" href="#_singleton_and_multiton_interfaces"></a>Singleton and Multiton Interfaces</h3>
 <div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
-<div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
-</li>
-<li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
-</li>
-<li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
-</li>
-<li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
-</li>
-</ul>
+<p>A CommaSuite interface is either <span id="singleton_vs_multiton">singleton or multiton</span>. The difference concerns the way an interface is provided to its clients.</p>
 </div>
 <div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
+<p>When a <em>multiton</em> interface is provided to clients, every client uses a separate instance of the interface. When a <em>singleton</em> interface is provided to clients, all the clients share the same instance of the interface.</p>
+</div>
+<div class="paragraph">
+<p>By default an interface is defined as multiton. The definition of a singleton interface requires a keyword to be explicitly given:</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>interface interfaceName //by default the interface is multiton
+
+singleton interface interfaceName //a singleton interface requires an explicit indication in the definition</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>The multiton/singleton dichotomy has an impact on the
+<a href="../generators/monitoring.html#singleton_multiton_monitoring">interface monitoring process</a>.</p>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/language/states.html
similarity index 82%
copy from site/download.html
copy to site/language/states.html
index 1bafd3b..0f855ef 100644
--- a/site/download.html
+++ b/site/language/states.html
@@ -441,103 +441,44 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="language.html">Language</a><ul class="sectlevel4"><li><a style="" href="types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="font-weight: bold" href="states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../tutorial/intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="../tutorial/preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../tutorial/serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_states"><a class="anchor" href="#_states"></a>States</h2>
 <div class="sectionbody">
-<div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
+<div class="paragraph normal">
+<p>The specification of states has the following structure. First, optionally, transitions that can be taken in all states can be specified:</p>
 </div>
-<div class="ulist">
-<ul>
-<li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
-</li>
-</ul>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code>in all states {
+        <a href="transitions.html">transitions</a>
+}</code></pre>
 </div>
-</li>
-<li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
-</li>
-<li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
-</li>
-</ol>
-</div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
-</div>
-<div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
-<div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
-<div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
-<div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
-</li>
-<li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
-</li>
-<li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
-</li>
-<li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
-</li>
-</ul>
 </div>
 <div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
+<p>If some transitions are generally defined for all states except some given states, they can be specified with the <strong>except</strong> keyword:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code>in all states except stateName {
+        <a href="transitions.html">transitions</a>
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Next the states are specified, with exactly one initial state per machine. Nested states are not allowed.</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code>initial state name1 {
+        <a href="transitions.html">transitions</a>
+}
+state name2 {
+        <a href="transitions.html">transitions</a>
+}</code></pre>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/language/timing_constraints.html
similarity index 69%
copy from site/download.html
copy to site/language/timing_constraints.html
index 1bafd3b..ba2fdbb 100644
--- a/site/download.html
+++ b/site/language/timing_constraints.html
@@ -441,104 +441,138 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="language.html">Language</a><ul class="sectlevel4"><li><a style="" href="types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="font-weight: bold" href="timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../tutorial/intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="../tutorial/preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../tutorial/serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_timing_constraints"><a class="anchor" href="#_timing_constraints"></a>Timing Constraints</h2>
 <div class="sectionbody">
-<div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
+<div class="paragraph normal">
+<p>Timing constraints are based on events. An event is an occurrence of one of the following actions:</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
+<p><span class="maroon"><strong>command</strong></span> Command_name, possibly with parameter(s)</p>
 </li>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
+<p><span class="maroon"><strong>notification</strong></span> Notification_name, possibly with parameter(s)</p>
 </li>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
+<p><span class="maroon"><strong>signal</strong></span> Signal_name, possibly with parameter(s)</p>
+</li>
+<li>
+<p><span class="maroon"><strong>reply</strong></span>, possibly with parameter(s), e.g., <span class="maroon"><strong>reply</strong></span>(3), or also giving the corresponding command: <span class="maroon"><strong>reply to command</strong></span> Command_name, possibly with parameter(s)</p>
 </li>
 </ul>
 </div>
-</li>
-<li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
-</li>
-<li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
-</li>
-</ol>
-</div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
-</div>
-<div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
 <div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
-<div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
-<div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
+<p>In addition, events can be referred to by their type, without giving a concrete name:</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
+<p><span class="maroon"><strong>any command</strong></span></p>
 </li>
 <li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
+<p><span class="maroon"><strong>any signal</strong></span></p>
 </li>
 <li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
+<p><span class="maroon"><strong>any notification</strong></span></p>
 </li>
 <li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
+<p><span class="maroon"><strong>any event</strong></span></p>
 </li>
 </ul>
 </div>
 <div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
+<p>When specifying events of interest, the states in which they may be observed can also be given: <span class="maroon"><strong>in</strong> <strong>state</strong></span> States event.</p>
 </div>
+<div class="paragraph">
+<p>Furthermore, an optional condition expression can be specified in which references to interface variables can be used:</p>
+</div>
+<div class="paragraph">
+<p><span class="maroon"><strong>in</strong> <strong>state</strong></span> States event <span class="maroon"><strong>when</strong></span> a &gt; 1, where <em>a</em> is an interface variable</p>
+</div>
+<div class="paragraph">
+<p>event <span class="maroon"><strong>when</strong></span> b == 2, where <em>b</em> is an interface variable</p>
+</div>
+<div class="paragraph">
+<p>The optional condition after <span class="maroon"><strong>when</strong></span> can be used only if the time constraint is given in an interface definition (.interface file).
+When the condition is evaluated, the value of the variables at the time of the event observation are used.</p>
+</div>
+<div class="paragraph">
+<p>Timing constraints are defined as rules and specify admissible intervals between observed events. There are five types of timing rules:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>ruleName <span class="maroon"><strong>in</strong> <strong>state</strong></span> States event1 <span class="maroon"><strong>and</strong> <strong>in</strong> <strong>state</strong></span> States event2 &#8594; interval <span class="maroon"><strong>between</strong> <strong>events</strong></span><br>
+<em>specifies that if there are two successive occurrences of event1 and event2 in one of the specified states then the difference of their time stamps is an element of the specified interval.</em> Example:</p>
+<div class="paragraph">
+<p>req1 <span class="maroon"><strong>in</strong> <strong>state</strong></span> on <span class="maroon"><strong>command</strong></span> Command <span class="maroon"><strong>and</strong> <strong>reply</strong></span>(5) &#8594; [ 5.0 <span class="maroon"><strong>ms</strong></span>  .. 10.6 <span class="maroon"><strong>ms</strong></span> ] <span class="maroon"><strong>between events</strong></span></p>
+</div>
+</li>
+<li>
+<p>ruleName <span class="maroon"><strong>in</strong> <strong>state</strong></span> States event1 <span class="maroon"><strong>when</strong></span> expression - interval &#8594; <span class="maroon"><strong>in</strong> <strong>state</strong></span> States event2<br>
+<em>specifies that if event1 occurs in one of the specified states and the value of a is greater than 0 then event2 will occur in one of the specified states and the difference of the time stamps of these two events is an element of the specified interval.</em> Example:</p>
+<div class="paragraph">
+<p>req2 <span class="maroon"><strong>in</strong> <strong>state</strong></span> on, off <span class="maroon"><strong>command</strong></span> Level <span class="maroon"><strong>when</strong></span> a &gt; 0 - [ .. 3.6 <span class="maroon"><strong>ms</strong></span> ] &#8594; <span class="maroon"><strong>notification</strong></span> Done</p>
+</div>
+</li>
+<li>
+<p>ruleName <span class="maroon"><strong>in</strong> <strong>state</strong></span> States event1 &#8594; <span class="maroon"><strong>absent in</strong> <strong>state</strong></span> States event2 <span class="maroon"><strong>in</strong></span> interval<br>
+<em>specifies that if event1 occurs in one of the specified states then event2 will not occur in one of the specified states in the specified interval after event1.</em> Example:</p>
+<div class="paragraph">
+<p>req3 <span class="maroon"><strong>in state</strong></span> on, off <span class="maroon"><strong>command</strong></span> Level &#8594; <span class="maroon"><strong>absent notification</strong></span> Done  <span class="maroon"><strong>in</strong></span> [ .. 3.6 <span class="maroon"><strong>ms</strong></span> ]</p>
+</div>
+</li>
+<li>
+<p>ruleName <span class="maroon"><strong>in</strong> <strong>state</strong></span> States event1 <span class="maroon"><strong>then</strong></span> event2 <span class="maroon"><strong>with</strong></span> <span class="maroon"><strong>period</strong></span> realNumber <span class="maroon"><strong>ms</strong> <strong>jitter</strong></span> realNumber <span class="maroon"><strong>ms</strong> <strong>until</strong></span> event3<br>
+<em>specifies that if event1 occurs in one of the specified states then event2 will occur periodically with period realNumber and jitter realNumber until event3 occurs.</em> Example:</p>
+<div class="paragraph">
+<p>req4 <span class="maroon"><strong>in state</strong></span> on <span class="maroon"><strong>command</strong></span> Command <span class="maroon"><strong>then in state</strong></span> operational <span class="maroon"><strong>notification</strong></span> Done <span class="maroon"><strong>with period</strong></span> 750.0 <span class="maroon"><strong>ms jitter</strong></span> 50.0 <span class="maroon"><strong>ms until reply to Command</strong></span> <br>
+<br>
+Note that this requires that the periodic notifications should occur in state operational.</p>
+</div>
+</li>
+<li>
+<p><span class="maroon"><strong>group</strong></span> ruleName <span class="maroon"><strong>in</strong> <strong>state</strong></span> States constraint (one of first three patterns) - interval1 &#8594; event1 - interval2 &#8594; event2 &#8230;&#8203;.. <span class="maroon"><strong>end</strong> <strong>group</strong></span><br>
+<em>specifies a scenario in terms of a sequence of events.</em> Example:</p>
+<div class="paragraph">
+<p><span class="maroon"><strong>group</strong></span> req5</p>
+</div>
+<div class="paragraph">
+<p><span class="maroon"><strong>in state</strong></span> on <span class="maroon"><strong>command</strong></span> Command <span class="maroon"><strong>and notification</strong></span> Done &#8594; [ .. 5.2 <span class="maroon"><strong>ms</strong></span> ] <span class="maroon"><strong>between events</strong></span>
+           <br>
+            - [ 10.0 <span class="maroon"><strong>ms</strong></span> .. 100.0 <span class="maroon"><strong>ms</strong></span> ] &#8594; command Level
+            <br>
+            - [ .. 20.0 <span class="maroon"><strong>ms</strong></span> ]&#8594; <span class="maroon"><strong>reply to command</strong></span> Level
+           <br>
+<span class="maroon"><strong>end group</strong></span></p>
+</div>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>States is a list of states, e.g., "on, off"; the "<span class="maroon"><strong>in</strong> <strong>state</strong></span>" part is optional.</p>
+</div>
+<div class="paragraph">
+<p>For an interval there are three possible forms:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>[ 10.1 <span class="maroon"><strong>ms</strong></span> .. 25.7 <span class="maroon"><strong>ms</strong></span> ] specifying a lower bound and an upper bound</p>
+</li>
+<li>
+<p>[ .. 25.7 <span class="maroon"><strong>ms</strong></span> ] specifying an upper bound only</p>
+</li>
+<li>
+<p>[ 10.1 <span class="maroon"><strong>ms</strong></span> .. ] specifying a lower bound only</p>
+</li>
+</ul>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/language/transitions.html
similarity index 72%
copy from site/download.html
copy to site/language/transitions.html
index 1bafd3b..4353b67 100644
--- a/site/download.html
+++ b/site/language/transitions.html
@@ -441,104 +441,145 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="language.html">Language</a><ul class="sectlevel4"><li><a style="" href="types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="font-weight: bold" href="transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../tutorial/intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="../tutorial/preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../tutorial/serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_transitions"><a class="anchor" href="#_transitions"></a>Transitions</h2>
 <div class="sectionbody">
+<div class="paragraph normal">
+<p>A transition has the form:</p>
+</div>
 <div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
+<p><span class="maroon">transition trigger</span>: someTrigger <span class="maroon">guard</span>: booleanExpression <span class="maroon">do</span>: actions  <span class="maroon">next state</span>: stateName</p>
+</div>
+<div class="paragraph">
+<p>The parts <span class="maroon"><strong>trigger:</strong></span>, <strong><span class="maroon">guard:</span></strong>, <strong><span class="maroon">do:</span></strong> are optional. The "<span class="maroon"><strong>next</strong> <strong>state:</span></strong>" part must be present, except in an "<span class="maroon"><strong>in</strong> <strong>all</strong> <strong>states</strong></span>" construction.</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
+<p>A <strong>trigger</strong> is a command or signal from the signature. For commands and signals with parameters, actual parameters have to be provided with a type e.g., <code>Command(int param)</code>.</p>
+</li>
+<li>
+<p>A <strong>guard</strong> is a boolean expression. Note that equality is denoted by &#8220;==&#8221;, e.g., <code>code == 3</code>.</p>
+</li>
+<li>
+<p>The <strong>do</strong> part is a sequence of actions. Possible actions are:</p>
 <div class="ulist">
 <ul>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
+<p><code><span class="maroon">if .. then .. else  .. fi</span></code></p>
 </li>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
+<p>A notification pattern: a notification defined in the signature plus constraints on the number of occurrences. Occurrences are given with the symbols '?' (optional), '+' (at least once), '*' (zero or more), or giving the expected numbers: [2], [1-3], [2-*]. When the occurrence is not given the notification is expected to happen once. Some examples: <code>info(23)?, statusChange(param, *)[2-*]</code></p>
 </li>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
+<p>Assignment, for instance <code>code := 3</code>.</p>
+</li>
+<li>
+<p>A reply to trigger command. This may include a return parameter, e.g., <code><span class="maroon">reply</span>(code+3)</code>. If it is not relevant to specify the return value, a &#8220;*&#8221; can be used, i.e., <code><span class="maroon">reply</span>(*)</code>.</p>
+</li>
+<li>
+<p><code><span class="maroon">any order</span></code> <span id="eventfragment">pattern</span>: a composition of notification patterns and a reply that can happen in any order, for example, <code><span class="maroon">any order</span>(<span class="maroon">reply</span>(Status::OnFailed), info(*), statusChange(*)*)</code>. In this example, the sequences of events shall contain one reply, one notification <em>info</em>, and zero or more notifications <em>statusChange</em>. All these events can be observed in any order.</p>
+<div class="paragraph">
+<p>If an observed event is not accepted by the <em>any order</em> pattern and does not cause an error then the execution continues with the next action. If the <em>any order</em> construct is the last action in the transition then the transition is traversed. Consider the example <code><span class="maroon">any order</span>(a, b*)</code>. The sequence <em>b, b, c</em> causes an error because the event <em>c</em> is not among the expected events and the event <em>a</em> is not observed yet. The sequence <em>a, c</em> is not an error because <em>a</em> has to be observed exactly once, <em>b</em> is optional. In this case, the event <em>c</em> is possibly indicated by an action after the <em>any order</em>.</p>
+</div>
+<div class="paragraph">
+<p>Sometimes a group of events is repeated in many <em>any order</em> actions thus causing too long and repetitive specifications. Such groups can be defined as named event fragments, can be referred to by name from other fragments and <em>any order</em> actions. Fragment definitions cannot contain replies.</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>interface iA
+
+event fragments
+    FrA = a+, b?
+
+    FrB = c[1-2], fragment FrA
+.....
+.....
+... any order(fragment FrA) ...</pre>
+</div>
+</div>
 </li>
 </ul>
 </div>
 </li>
-<li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
-</li>
-<li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
-</li>
-</ol>
-</div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
 </ul>
 </div>
-<div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
 <div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
+<p>To express non-determinism, e.g., because the response to a trigger depends on internal state information, the <code><span class="maroon">OR</span></code> construct can be used. For instance:</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>transition trigger: PowerOn
+   do: reply(Status::OnOK)      next state: SwitchingOn
+   OR
+   do: reply(Status::OnFailed)  next state: Off</pre>
 </div>
 </div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
 <div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
+<p>An example of a state with transitions:</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>state on {
+   transition
+       trigger: CurrentTemp(Status st, string info, bool error)
+       guard: 12.0 &lt; temp AND temp &lt; 34.7
+       do: localstat := st
+       reply(temp)
+       next state: on
+
+   transition
+       guard: code == 3
+       do: myMode(Mode::on)
+       next state: on
+}</pre>
 </div>
 </div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
 <div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
+<p>If the trigger of a transition is a command that has <strong>inout</strong> or <strong>out</strong> parameters, their values should be given in the <strong>reply</strong> in the following order:</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
+<p>the values of <strong>inout</strong> or <strong>out</strong> parameters in the order they appear in the signature of the command</p>
 </li>
 <li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
-</li>
-<li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
-</li>
-<li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
+<p>the return value of the command. If the return type is void then no value is given</p>
 </li>
 </ul>
 </div>
 <div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
+<p>For example, assume a command defined in a signature file:</p>
 </div>
+<div class="literalblock">
+<div class="content">
+<pre>commands
+bool doSomething(int input, out int r)</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>The reply in a transition shall be:</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre> transition trigger: doSomething(int input, int r)
+ do:
+ ...
+ reply(2, true)</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>In this example, <em>true</em> is the return value of the command, <em>2</em> is the value of the out parameter r.</p>
+</div>
+<div class="paragraph">
+<p>In the body of transitions, <strong>out</strong> parameters are <span class="underline">write-only</span>, that is, they can only be assigned with values but their value cannot be read in an expression.</p>
+</div>
+<div class="paragraph">
+<p>The special value <em>any</em> (*) can be used in <strong>reply</strong> for <strong>inout</strong> and <strong>out</strong> parameters. If an <strong>out</strong> parameter is not explicitly assigned with a value in a transition body then the default value of the corresponding type will be used.</p>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/language/types.html
similarity index 70%
copy from site/download.html
copy to site/language/types.html
index 1bafd3b..13658df 100644
--- a/site/download.html
+++ b/site/language/types.html
@@ -441,104 +441,261 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="language.html">Language</a><ul class="sectlevel4"><li><a style="font-weight: bold" href="types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../tutorial/intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="../tutorial/preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../tutorial/serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_types"><a class="anchor" href="#_types"></a>Types</h2>
 <div class="sectionbody">
+<div class="sect2 normal">
+<h3 id="_type_definitions"><a class="anchor" href="#_type_definitions"></a>Type Definitions</h3>
 <div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
+<p>Users can define types in type models stored in files with extension '.types' or in <a href="interfaces.html">interface signature models</a>.</p>
+</div>
+<div class="paragraph">
+<p>A type model may import other type models by the following import statement:</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>import "myTypes.types"</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>The import mechanism works transitively: when a type model is imported, the models imported by it are also imported.</p>
+</div>
+<div class="paragraph">
+<p><strong>Predefined types:</strong> bool, int, real, string, bulkdata.</p>
+</div>
+<div class="paragraph">
+<p>Values of type <em>real</em> can also support the exponential notation with <strong>e</strong>. A value of type real has the syntax:</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>3.2
+2.0e-5</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Values of type <em>bulkdata</em> are uninterpreted byte arrays.</p>
+</div>
+<div class="paragraph">
+<p>A value of type bulkdata has the syntax:</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>Bulkdata&lt;$optional_size$&gt;</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Examples:</p>
+</div>
+<div class="paragraph">
+<p><span class="maroon">Bulkdata</span>&lt;1000&gt;<br>
+<span class="maroon">Bulkdata</span>&lt;&gt;</p>
+</div>
+<div class="paragraph">
+<p><span class="maroon"><strong>Basic types</strong></span> Users can define their own basic types:</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>   type unit
+   type uint
+   type wstring
+   type Pixel
+   type Time
+   type Command</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>User-defined basic types are uninterpreted, their set of values is unknown. It is possible to relate a basic type to one of the predefined types <em>int</em>, <em>string</em>, and <em>real</em>. In this way values of the predefined type can be used for the basic type:</p>
+</div>
+<div class="paragraph">
+<p><code><span class="maroon">type</span> unit <span class="maroon">base on</span> int</code></p>
+</div>
+<div class="paragraph">
+<p><span class="maroon"><strong>Enumeration types</strong></span> An example:</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>enum Mode {
+    updating
+    working
+    sleeping
+}</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Refer to an element of an enumeration type by</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>Mode::working</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Optionally, enumeration literals may be assigned with non-negative integers:</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>enum Mode {
+    updating = 1 //if not explicitly given, the first literal assumes value 0
+    working  //if not given, the value will increment the previous one, i.e. 2
+    sleeping = 4 //user may give a value greater than the increment of the previous value
+}</pre>
+</div>
+</div>
+<div class="paragraph">
+<p><span class="maroon"><strong>Vector Types</strong></span></p>
+</div>
+<div class="paragraph">
+<p>Vector types are defined by giving a base type and a number of dimensions. For each dimension, an optional size can also be given.</p>
+</div>
+<div class="paragraph">
+<p><span class="maroon">vector</span> Image = Pixel [ 10 ] [ 20 ]<br>
+<span class="maroon">vector</span> Requests = Command []<br></p>
+</div>
+<div class="paragraph">
+<p>Literal values of vector types have the syntax: &lt;VectorType&gt;[element1, element2, &#8230;&#8203;]. For example:</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>&lt;int[]&gt;[] //example of empty vector of integers
+&lt;int[]&gt;[1, 2]
+&lt;string[][]&gt;[&lt;string[]&gt;["John", "Smith"], &lt;string[]&gt;["John", "Doe"]]</pre>
+</div>
+</div>
+<div class="paragraph">
+<p><span class="maroon"><strong>Record Types</strong></span></p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>record Status {
+    Image image1
+    Pixel [10 ] [ 20 ] image2
+    Time time
+}</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>In this example, the field image2 illustrates the possibility to use vector types inline, i.e. without giving an explicit name like in the case of type Image.</p>
+</div>
+<div class="paragraph">
+<p>It is also possible for one record type to extend another:</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>record Person {
+    string name
+    string address
+}
+
+record Student extends Person{
+    string university
+}</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Instances of record types have the syntax: TypeName{field1 = value1, field2 = value2, &#8230;&#8203;}. For example:</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>Person{name = "John", age = 25}</pre>
+</div>
+</div>
+<div class="paragraph">
+<p><span class="maroon"><strong>Map Types</strong></span></p>
+</div>
+<div class="paragraph">
+<p>Map types are defined by giving the key and value types of the map. The key type must be a basic type or enumeration.</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>aMapType = map&lt;int, int&gt;</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Map types can also be used inline (without giving a name).</p>
+</div>
+<div class="paragraph">
+<p>Instances of map types have the syntax: &lt;type&gt;{key1 &#8594; value1, key2 &#8594; value2, &#8230;&#8203;}. For example:</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>&lt;aMapType&gt;{} //example of an empty map
+&lt;map&lt;int, int&gt;&gt;{1 -&gt; 0, 2 -&gt; 0}</pre>
+</div>
+</div>
+<div class="paragraph">
+<p><em>Limitations for maps:</em></p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
+<p>Maps are not supported in simulation and test generation tasks. They can be used in behavior specifications (interfaces and component functional constraints) and are supported in monitoring tasks.</p>
 </li>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
+<p>Maps cannot be used as parameter and return types of events in signatures.</p>
 </li>
 </ul>
 </div>
-</li>
-<li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
-</li>
-<li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
-</li>
-</ol>
-</div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
 </div>
 <div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
+<h3 id="_types_usage"><a class="anchor" href="#_types_usage"></a>Types Usage</h3>
 <div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
+<p>Types are used in variable declarations and in event parameter declarations. Types are given either by name or as inline vector or map declarations (similar to C-family of languages).</p>
+</div>
+<div class="paragraph">
+<p>Examples:</p>
+</div>
+<div class="literalblock">
+<div class="content">
+<pre>variables
+int i //variable of the predefined type int
+Mode m //variable of enumeration type named Mode
+Image img //variable of named vector type
+
+int[] intVector //variable of inlined vector type</pre>
+</div>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
+<h3 id="_default_values"><a class="anchor" href="#_default_values"></a>Default Values</h3>
 <div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
+<p>Every type has a default value. It is usually used to automatically initialize variables that are not explicitly given a value.
+Below are the default values for each type.</p>
 </div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
 <div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
+<p><em>Default values:</em></p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
+<p>int: 0</p>
 </li>
 <li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
+<p>real: 0.0</p>
 </li>
 <li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
+<p>bool: true</p>
 </li>
 <li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
+<p>string: ""</p>
+</li>
+<li>
+<p>enums: the first enumeration literal</p>
+</li>
+<li>
+<p>records: a record with the default values for the field types</p>
+</li>
+<li>
+<p>vector: an empty vector</p>
+</li>
+<li>
+<p>map: an empty map</p>
 </li>
 </ul>
 </div>
-<div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
-</div>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/overview/gettingstarted.html
similarity index 77%
copy from site/download.html
copy to site/overview/gettingstarted.html
index 1bafd3b..82a7e89 100644
--- a/site/download.html
+++ b/site/overview/gettingstarted.html
@@ -441,104 +441,91 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="intro.html">Language overview</a><ul class="sectlevel3"><li><a style="font-weight: bold" href="gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="../language/language.html">Language</a><ul class="sectlevel4"><li><a style="" href="../language/types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="../language/states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="../language/components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../tutorial/intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="../tutorial/preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../tutorial/serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_getting_started"><a class="anchor" href="#_getting_started"></a>Getting Started</h2>
 <div class="sectionbody">
-<div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
+<div class="paragraph normal">
+<p>The CommaSuite language allows specifying the signature and behaviour of interfaces, and components that use multiple interfaces.
+The typical steps are:</p>
 </div>
-<div class="ulist">
-<ul>
-<li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
-</li>
-</ul>
-</div>
-</li>
-<li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
 <div class="olist arabic">
 <ol class="arabic">
 <li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
+<p>Define the interface signature model.</p>
+<div class="paragraph">
+<p>The interface signature (definitions of commands, signals and notifications) is specified in a single model stored in a file with extension <em>.signature</em>.
+The user can define interface-specific types and can import types from type definition models (files with extension <em>.types</em>)</p>
+</div>
 </li>
 <li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
+<p>Define the interface behaviour model.</p>
+<div class="paragraph">
+<p>Interface behaviour is defined in a single model stored in a file with extension <em>.interface</em>. This model uses the already defined interface signature model.</p>
+</div>
 </li>
 <li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
+<p>Optionally, define components that use several interfaces.</p>
+<div class="paragraph">
+<p>Components are abstractions that provide a context to define how a group of interfaces work together.</p>
+</div>
 </li>
 <li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
+<p>Define the desired generation tasks.</p>
+<div class="paragraph">
+<p>Generation tasks are defined in project files (files with extension <em>.prj</em>).
+A project typically imports a number of interfaces and components.
+Generation tasks may depend on each other, for example,
+one task produces artifacts used as an input for another task.</p>
+</div>
 </li>
 </ol>
 </div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
+<div class="paragraph">
+<p>A new CommaSuite project can be easily created with the provided wizard.
+Select from menu <em>File/New/Project&#8230;&#8203;</em> and then choose <em>CommaSuite Project</em>.
+Give a name to the project.</p>
+</div>
+<div class="paragraph">
+<p>The wizard automatically creates interface signature, interface behaviour and project models with default minimal content.</p>
+</div>
+<div class="paragraph">
+<p>There are several illustrative examples on the use of the language.
+Examples can be loaded from menu <em>File/New/Example&#8230;&#8203;</em> and then
+selecting section <em>CommaSuite Examples</em></p>
+</div>
+<div class="paragraph">
+<p>Hands-on experience with the tooling can be obtained
+by the <a href="../tutorial/intro.html">tutorial</a>.</p>
 </div>
 <div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
+<h3 id="_editors"><a class="anchor" href="#_editors"></a>Editors</h3>
 <div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
-<div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
-<div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
+<p>The CommaSuite text editors provide the following content assistance functionality.</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
+<p>Auto completion and code templates<br>
+The key combination &lt;CTRL&gt;-&lt;Space&gt; shows the next possible syntax token in a given context.
+In addition, predefined code templates can be chosen from a drop-down context menu.
+The following screen shows a list of available code templates for commands in an interface signature model and the content of a template for a simple command with one input parameter:<br>
+<span class="image"><img src="../img/Templates.png" alt="image"></span></p>
 </li>
 <li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
+<p>Quick fixes<br>
+In case of a syntax error, quick fixes may be suggested after hovering over the underlined error.<br>
+<span class="image"><img src="../img/QuickFix.png" alt="image"></span></p>
 </li>
 <li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
-</li>
-<li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
+<p>Auto formatting<br>
+The key combination &lt;CTRL&gt;-&lt;Shift&gt;-&lt;F&gt; automatically formats the code being edited.</p>
 </li>
 </ul>
 </div>
-<div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
-</div>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/overview/intro.html
similarity index 77%
copy from site/download.html
copy to site/overview/intro.html
index 1bafd3b..59850ea 100644
--- a/site/download.html
+++ b/site/overview/intro.html
@@ -441,104 +441,111 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="font-weight: bold" href="intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="../language/language.html">Language</a><ul class="sectlevel4"><li><a style="" href="../language/types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="../language/states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="../language/components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../tutorial/intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="../tutorial/preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../tutorial/serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_introduction"><a class="anchor" href="#_introduction"></a>Introduction</h2>
 <div class="sectionbody">
+<div class="paragraph normal">
+<p>The lack of precise and explicit specifications of component interfaces often
+leads to problems during the integration of components.
+Also updates of components might lead to system issues,
+e.g., caused by changes in the interaction protocol or timing behavior.
+At system level, it is usually difficult to detect the source of such issues.
+The CommaSuite framework consists of a set of languages and tools that
+allow the precise definition and analysis of client-server interfaces.</p>
+</div>
 <div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
+<p>To specify the interface of a server towards its clients,
+the approach contains the following ingredients:</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
+<p>The interface signature, i.e., the set of commands, signals and notifications
+that a server offers to its clients.</p>
+<div class="paragraph">
+<p><span class="image"><img src="../img/image1.png" alt="image" width="248" height="146"></span></p>
+</div>
 <div class="ulist">
 <ul>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
+<p>Commands: synchronous function calls from client to server;
+the server sends a reply to the client</p>
 </li>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
+<p>Signals: asynchronous function calls from client to server;
+the server does not send a reply</p>
 </li>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
+<p>Notifications: asynchronous messages from server to client;
+the client does not send a reply</p>
 </li>
 </ul>
 </div>
 </li>
 <li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
+<p>State machines that describe the interaction protocol between
+client and server, i.e., the allowed sequence of commands, signals and
+notifications in any state.</p>
 </li>
 <li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
-</li>
-</ol>
-</div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
+<p>Data and timing constraints on the client-server interaction,
+such as lower and upper bounds on response times, periodicity requirements,
+and constraints on parameters of events.</p>
 </li>
 </ul>
 </div>
-<div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
 <div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
+<p>The CommaSuite language also allows modeling of components with required and provided interfaces.
+Also constraints between interfaces can be expressed.</p>
 </div>
-</div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
 <div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
+<p>Based on these models a number of different artifacts can be generated,
+as illustrated in the following figure.</p>
 </div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
 <div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
+<p><span class="image"><img src="../img/CommaOverview.png" alt="image"></span></p>
+</div>
+<div class="paragraph">
+<p>We list a number of possible generators:</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
+<p>Visualization and documentation. The CommaSuite framework generates plantUML files that visualize state machines.
+In addition, constraints can be intuitively represented as annotated UML sequence diagrams. Also MS Word documents
+can be generated by extracting definitions and comments from models and
+inserting them in a document template.
+This process also utilizes the diagrams obtained from state machines and
+constraint rules.</p>
 </li>
 <li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
+<p>Interface proxy code.
+Interface signatures can be transformed to interface proxy code
+for deployment on a particular type of middleware.</p>
 </li>
 <li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
+<p>Model-based testing.
+Based on the state machines, test cases and models can be generated for various testing
+techniques.</p>
 </li>
 <li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
+<p>Simulation. Simulation of a model helps in receiving an early feedback and
+detecting errors.</p>
+</li>
+<li>
+<p>Monitoring. A monitors can be generated to check whether a trace
+of client-server interaction conforms to the specification,
+both for a single interface and for a component with multiple interfaces and
+additional constraints.</p>
 </li>
 </ul>
 </div>
 <div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
-</div>
+<p>See the currently supported <a href="../generators/generators.html">generators</a>.</p>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/problems/problemsolving.html
similarity index 80%
copy from site/download.html
copy to site/problems/problemsolving.html
index 1bafd3b..8069bb9 100644
--- a/site/download.html
+++ b/site/problems/problemsolving.html
@@ -441,104 +441,58 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="../language/language.html">Language</a><ul class="sectlevel4"><li><a style="" href="../language/types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="../language/states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="../language/components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../tutorial/intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="../tutorial/preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../tutorial/serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="font-weight: bold" href="problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_common_problems_and_solutions"><a class="anchor" href="#_common_problems_and_solutions"></a>Common Problems and Solutions</h2>
 <div class="sectionbody">
+<div class="sect2 normal">
+<h3 id="_outdated_validation_messages"><a class="anchor" href="#_outdated_validation_messages"></a>Outdated validation messages</h3>
 <div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
+<p>When validation messages (errors or warnings) shown in the CommaSuite editors seem outdated
+it is useful to revalidate all files using:</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
+<p>Project &gt; Clean</p>
 </li>
 </ul>
 </div>
-</li>
-<li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
-</li>
-<li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
-</li>
-</ol>
-</div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
-</div>
-<div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
 <div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
+<p>Sometimes a complete restart may be needed.</p>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
+<h3 id="_black_console_view"><a class="anchor" href="#_black_console_view"></a>Black console view</h3>
 <div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
+<p>Sometimes the Console view might become black as shown in
+the figure below.
+Then right-click in the window, select Preferences.
+In Console view click on Background color, select white from Basic colors, OK,
+Apply and Close.<br>
+<span class="image"><img src="../img/image4.png" alt="image" title="Black console view"></span></p>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
+<h3 id="_updating_the_documentation_template"><a class="anchor" href="#_updating_the_documentation_template"></a>Updating the Documentation Template</h3>
 <div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
+<p>The documentation template is a subject of regular updates.
+Existing projects may still use an outdated template.
+In some cases this can even result in errors during the execution of the generation tasks.
+To solve this, delete or rename the existing template and
+import the new one:</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
-</li>
-<li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
-</li>
-<li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
-</li>
-<li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
+<p>right-click on the project file and select
+'Import Documentation Template' from the context menu.</p>
 </li>
 </ul>
 </div>
-<div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
-</div>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/shortcuts/shortcuts.html
similarity index 77%
copy from site/download.html
copy to site/shortcuts/shortcuts.html
index 1bafd3b..694e71e 100644
--- a/site/download.html
+++ b/site/shortcuts/shortcuts.html
@@ -441,103 +441,188 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="../language/language.html">Language</a><ul class="sectlevel4"><li><a style="" href="../language/types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="../language/states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="../language/components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../tutorial/intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="../tutorial/preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../tutorial/serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="../tutorial/activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="../tutorial/activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="../tutorial/concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="font-weight: bold" href="shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_shortcuts"><a class="anchor" href="#_shortcuts"></a>Shortcuts</h2>
 <div class="sectionbody">
-<div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
-</div>
+<div class="sect2 normal">
+<h3 id="_useful_shortcuts_for_modeling_and_generation"><a class="anchor" href="#_useful_shortcuts_for_modeling_and_generation"></a>Useful shortcuts for modeling and generation</h3>
 <div class="ulist">
 <ul>
 <li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
+<p>Content assist / show available code templates:</p>
 <div class="ulist">
 <ul>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
+<p><code>CTRL</code> + <code>SPACE</code></p>
 </li>
 </ul>
 </div>
 </li>
 <li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
-</li>
-<li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
-</li>
-</ol>
-</div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
-</div>
-<div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
-<div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
-<div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
-<div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
-</div>
+<p>Automatic formatting (formats the selected text or
+the whole document when nothing is selected):</p>
 <div class="ulist">
 <ul>
 <li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
-</li>
-<li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
-</li>
-<li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
-</li>
-<li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
+<p><code>CTRL</code> + <code>SHIFT</code> + <code>F</code></p>
 </li>
 </ul>
 </div>
-<div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
+</li>
+<li>
+<p>Save file</p>
+<div class="ulist">
+<ul>
+<li>
+<p><code>CTRL</code> + <code>S</code></p>
+</li>
+</ul>
+</div>
+</li>
+<li>
+<p>Hyper-linking from an element (variable, method, type, etc.) to its declaration:</p>
+<div class="ulist">
+<ul>
+<li>
+<p><code>F3</code> while the cursor position is at the element</p>
+</li>
+<li>
+<p><code>CTRL</code> + click on the element</p>
+</li>
+</ul>
+</div>
+</li>
+<li>
+<p>Execute the workflow project when the editor is open:</p>
+<div class="ulist">
+<ul>
+<li>
+<p><code>CTRL</code> + <code>B</code></p>
+</li>
+</ul>
+</div>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_basic_eclipse_shortcuts"><a class="anchor" href="#_basic_eclipse_shortcuts"></a>Basic Eclipse shortcuts</h3>
+<div class="ulist">
+<ul>
+<li>
+<p>Split view:</p>
+<div class="ulist">
+<ul>
+<li>
+<p>Open two tabs, click on one tab and drag it to the text area;
+then a vertical or horizontal screen outline will become visible;
+release the mouse for the desired lay-out.</p>
+</li>
+<li>
+<p><code>CTRL</code> + <code>_</code> splits a text editor for a single file horizontally</p>
+</li>
+<li>
+<p><code>CTRL</code> +  <code>{</code> splits a text editor for a single file vertically</p>
+</li>
+</ul>
+</div>
+</li>
+<li>
+<p>Switch between tabs:</p>
+<div class="ulist">
+<ul>
+<li>
+<p><code>CTRL</code> + <code>Page Up</code></p>
+</li>
+<li>
+<p><code>CTRL</code> + <code>Page Down</code></p>
+</li>
+</ul>
+</div>
+</li>
+<li>
+<p>Maximize current editor (tab):</p>
+<div class="ulist">
+<ul>
+<li>
+<p><code>CTRL</code> + <code>M</code></p>
+</li>
+<li>
+<p>Double click on tab</p>
+</li>
+</ul>
+</div>
+</li>
+<li>
+<p>Jump to position of last edit</p>
+<div class="ulist">
+<ul>
+<li>
+<p><code>CTRL</code> + <code>Q</code></p>
+</li>
+</ul>
+</div>
+</li>
+<li>
+<p>Increase/Decrease font size of the textual editors</p>
+<div class="ulist">
+<ul>
+<li>
+<p><code>CTRL</code> + <code>=</code> increases the font size</p>
+</li>
+<li>
+<p><code>CTRL</code> + <code>-</code> decreases the font size</p>
+</li>
+<li>
+<p>(Alternatively, via menus: Window &#8594; Preferences &#8594; General &#8594; Appearance &#8594; Colors and Fonts &#8594; Basic &#8594; Text Font &#8594; Edit&#8230;&#8203;)</p>
+</li>
+</ul>
+</div>
+</li>
+<li>
+<p>Switch between views:</p>
+<div class="ulist">
+<ul>
+<li>
+<p><code>CTRL</code> + <code>F6</code> opens a list with editors</p>
+</li>
+<li>
+<p><code>CTRL</code> + <code>F7</code> opens a list with views</p>
+</li>
+<li>
+<p><code>CTRL</code> + <code>F8</code> opens a list with perspectives</p>
+</li>
+</ul>
+</div>
+</li>
+<li>
+<p>Outline view:</p>
+<div class="ulist">
+<ul>
+<li>
+<p>Window &#8594; Show view &#8594; Outline</p>
+</li>
+<li>
+<p><code>CTRL</code> + <code>O</code> opens a quick outline that is searchable (including wildcards)</p>
+</li>
+</ul>
+</div>
+</li>
+<li>
+<p>Find references:</p>
+<div class="ulist">
+<ul>
+<li>
+<p><code>CTRL</code> + <code>SHIFT</code> + <code>G</code> on the element (variable, method, type, etc.)</p>
+</li>
+</ul>
+</div>
+</li>
+</ul>
 </div>
 </div>
 </div>
diff --git a/site/developers.html b/site/site/developers.html
similarity index 98%
rename from site/developers.html
rename to site/site/developers.html
index 42a21fe..9a03f0b 100644
--- a/site/developers.html
+++ b/site/site/developers.html
@@ -441,7 +441,7 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="" href="/site/download.html">Download</a></li><li><a style="font-weight: bold" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="download.html">Download</a></li><li><a style="font-weight: bold" href="developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
 </div>
 </div>
 <div id="content">
diff --git a/site/download.html b/site/site/download.html
similarity index 98%
rename from site/download.html
rename to site/site/download.html
index 1bafd3b..7f893eb 100644
--- a/site/download.html
+++ b/site/site/download.html
@@ -441,7 +441,7 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="font-weight: bold" href="download.html">Download</a></li><li><a style="" href="developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
 </div>
 </div>
 <div id="content">
diff --git a/site/download.html b/site/tutorial/activity1.html
similarity index 81%
copy from site/download.html
copy to site/tutorial/activity1.html
index 1bafd3b..b555fbd 100644
--- a/site/download.html
+++ b/site/tutorial/activity1.html
@@ -441,104 +441,48 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="../language/language.html">Language</a><ul class="sectlevel4"><li><a style="" href="../language/types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="../language/states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="../language/components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="font-weight: bold" href="activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_activity_1_get_familiar_with_the_vending_machine"><a class="anchor" href="#_activity_1_get_familiar_with_the_vending_machine"></a>Activity 1: Get familiar with the Vending Machine</h2>
 <div class="sectionbody">
-<div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
-</div>
-<div class="ulist">
+<div class="ulist normal">
 <ul>
 <li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
+<p>Navigate to folder <em>src/vendingMachine.</em> It contains file <em>TestUI.java</em>.
+Run this file as a Java application (right click and then <em>Run as/Java Application</em>).</p>
 </li>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
+<p>This leads to a GUI where buttons are commands that the machine can execute.
+Some commands require the selection of the result, indicated in red.</p>
 </li>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
+<p>Use the <em>Start</em> button and experiment with the machine. For instance, use the service interface to switch the machine on,
+insert coins and order products by means of the user interface.</p>
+</li>
+<li>
+<p>After pushing the <em>Save</em> button, the sequence of the executed commands and
+the responses is stored as an execution trace in the file <em>VendingMachine.events</em>.
+This file will be used later to check if the trace conforms to a behavioral specification.<br></p>
 </li>
 </ul>
 </div>
-</li>
-<li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
-</li>
-<li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
-</li>
-</ol>
-</div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
-</div>
-<div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
+<div class="admonitionblock tip">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-tip" title="Tip"></i>
+</td>
+<td class="content">
 <div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
+<p>If the file <em>VendingMachine.events</em> is not visible in the project,
+right-click on the project and choose "Refresh" or F5.</p>
 </div>
-</div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
-<div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
-<div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
-</li>
-<li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
-</li>
-<li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
-</li>
-<li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
-</div>
+</td>
+</tr>
+</table>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/tutorial/activity10.html
similarity index 83%
copy from site/download.html
copy to site/tutorial/activity10.html
index 1bafd3b..23a9f15 100644
--- a/site/download.html
+++ b/site/tutorial/activity10.html
@@ -441,105 +441,28 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="../language/language.html">Language</a><ul class="sectlevel4"><li><a style="" href="../language/types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="../language/states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="../language/components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="font-weight: bold" href="activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_activity_10_check_the_specified_interfaces_by_monitoring"><a class="anchor" href="#_activity_10_check_the_specified_interfaces_by_monitoring"></a>Activity 10: Check the specified interfaces by monitoring</h2>
 <div class="sectionbody">
-<div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
-</div>
-<div class="ulist">
+<div class="ulist normal">
 <ul>
 <li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
+<p>Extend the project file <em>VendingMachine.prj</em> with an import of <em>IUser.interface</em>.
+Add a monitoring task for the IUser interface.</p>
 </li>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
+<p>Use the GUI to generate .event files using commands from all interfaces.</p>
 </li>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
+<p>Apply monitoring to check all .event files.
+Inspect the coverage, the monitoring results and improve models when needed.</p>
 </li>
 </ul>
 </div>
-</li>
-<li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
-</li>
-<li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
-</li>
-</ol>
-</div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
-</div>
-<div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
-<div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
-<div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
-<div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
-</li>
-<li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
-</li>
-<li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
-</li>
-<li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
-</div>
-</div>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/tutorial/activity11.html
similarity index 82%
copy from site/download.html
copy to site/tutorial/activity11.html
index 1bafd3b..0683a15 100644
--- a/site/download.html
+++ b/site/tutorial/activity11.html
@@ -441,104 +441,56 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="../language/language.html">Language</a><ul class="sectlevel4"><li><a style="" href="../language/types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="../language/states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="../language/components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="font-weight: bold" href="activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_activity_11_define_time_constraints"><a class="anchor" href="#_activity_11_define_time_constraints"></a>Activity 11: Define time constraints</h2>
 <div class="sectionbody">
+<div class="paragraph normal">
+<p>A few constraints on time and data are added to interface IUser.<br></p>
+</div>
+<div class="admonitionblock tip">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-tip" title="Tip"></i>
+</td>
+<td class="content">
 <div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
+<p>See the user guide on <a href="../language/timing_constraints.html">timing constraints</a>.</p>
 </div>
-<div class="ulist">
-<ul>
-<li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
-</li>
-</ul>
+</td>
+</tr>
+</table>
 </div>
-</li>
-<li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
 <div class="olist arabic">
 <ol class="arabic">
 <li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
+<p>Write two time constraint for the following requirements:</p>
+<div class="olist loweralpha">
+<ol class="loweralpha" type="a">
+<li>
+<p>the reply of a command to return money occurs between 1000.0 ms and 5000.0 ms</p>
 </li>
 <li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
+<p>when an <em>OrderProduct</em> leads to a delivered product, the reply occurs within 3.0 ms</p>
 </li>
 </ol>
 </div>
 </li>
 <li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
-</div>
-<div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
-<div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
-<div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
-<div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
+<p>Use the GUI to create a .event file where a coin is inserted many times and
+money is returned frequently.
+Similarly, construct a .events file where products are delivered several times.</p>
 </li>
 <li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
+<p>Run the monitoring and inspect the results in file <em>dashboard.html</em> in
+folder <em>comma-gen</em>. Note that violations of time constraints
+lead to warnings and the dashboard also contains statistical information.</p>
 </li>
-<li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
-</li>
-<li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
-</div>
+</ol>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/tutorial/activity12.html
similarity index 83%
copy from site/download.html
copy to site/tutorial/activity12.html
index 1bafd3b..caf5da0 100644
--- a/site/download.html
+++ b/site/tutorial/activity12.html
@@ -441,105 +441,34 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="../language/language.html">Language</a><ul class="sectlevel4"><li><a style="" href="../language/types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="../language/states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="../language/components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="font-weight: bold" href="activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_activity_12_define_a_data_constraint"><a class="anchor" href="#_activity_12_define_a_data_constraint"></a>Activity 12: Define a data constraint</h2>
 <div class="sectionbody">
-<div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
+<div class="olist arabic normal">
+<ol class="arabic" start="1">
+<li>
+<p>Add the following data constraint which expresses that when the return of
+money is requested,
+the delivered amount cannot be negative:</p>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code>data constraints
+variables
+int val
+
+returnReg command ReturnMoney;reply(val) where val &gt;= 0</code></pre>
 </div>
-<div class="ulist">
-<ul>
-<li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
-</li>
-</ul>
 </div>
 </li>
 <li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
-</li>
-<li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
+<p>Run the monitoring and inspect the results.</p>
 </li>
 </ol>
 </div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
-</div>
-<div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
-<div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
-<div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
-<div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
-</li>
-<li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
-</li>
-<li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
-</li>
-<li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
-</div>
-</div>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/tutorial/activity13.html
similarity index 78%
copy from site/download.html
copy to site/tutorial/activity13.html
index 1bafd3b..f1e13db 100644
--- a/site/download.html
+++ b/site/tutorial/activity13.html
@@ -441,104 +441,116 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="../language/language.html">Language</a><ul class="sectlevel4"><li><a style="" href="../language/types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="../language/states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="../language/components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="font-weight: bold" href="activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_activity_13_define_component_and_add_functional_constraint"><a class="anchor" href="#_activity_13_define_component_and_add_functional_constraint"></a>Activity 13: Define component and add functional constraint</h2>
 <div class="sectionbody">
+<div class="paragraph normal">
+<p>Create in the main project directory a file <em>VendingMachine.component</em>
+using File &gt; New &gt; File, with the VendingMachine project as parent.
+Insert the following text (you may copy the text below):</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code>import "IUser/IUser.interface"
+import "IService/IService.interface"
+import "ICoinCheck/ICoinCheck.interface"
+
+component VendingMachine
+
+provided port IUser vmUserPort
+provided port IService vmServicePort
+required port ICoinCheck vmCoinPort
+
+functional constraints
+
+OperationalConstraintInsertCoin {
+    /* InsertCoin Command of IUser returns NOT_OPERATIONAL
+     * when IService is not in state Operational
+     * Otherwise it returns ACCEPTED or NOT_ACCEPTED
+     */
+    use events
+    vmUserPort::reply to command InsertCoin
+
+    initial state CoinReply {
+        vmUserPort::reply (*,CoinResult::NOT_OPERATIONAL) to command InsertCoin
+             where NOT vmServicePort in Operational
+        next state: CoinReply
+
+        vmUserPort::reply (*,CoinResult::ACCEPTED) to command InsertCoin
+             where vmServicePort in Operational
+        next state: CoinReply
+
+        vmUserPort::reply (*,CoinResult::NOT_ACCEPTED) to command InsertCoin
+             where vmServicePort in Operational
+        next state: CoinReply
+    }
+}</code></pre>
+</div>
+</div>
 <div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
+<p>Improve the lay-out using <em>&lt;CTRL&gt;-&lt;SHIFT&gt;-F</em>.</p>
+</div>
+<div class="paragraph">
+<p>This specification assumes that interface IService has a state called <em>Operational</em>
+to represent that the machine is on and not in an error.
+Replace it with the state name of your model.</p>
+</div>
+<div class="paragraph">
+<p>The functional constraint restricts the reply to command <em>InsertCoin</em>
+as indicated in the <span class="purple"><strong>use events</strong></span> part.
+The specification expresses that when a reply to <em>InsertCoin</em> occurs,
+one of the following cases should hold:</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
+<p>the result is NOT_OPERATIONAL and
+the state machine of the vmServicePort in not in state Operational, or</p>
 </li>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
+<p>the result is ACCEPTED and
+the state machine of the vmServicePort in in state Operational, or</p>
 </li>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
+<p>the result is NOT_ACCEPTED and
+the state machine of the vmServicePort in in state Operational.</p>
 </li>
 </ul>
 </div>
-</li>
-<li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
-</li>
-<li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
-</li>
-</ol>
-</div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
-</div>
-<div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
 <div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
-<div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
-<div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
+<p>To monitor the component constraints, change the file <em>VendingMachine.prj</em> as follows:</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
+<p>Import <em>VendingMachine.component</em></p>
 </li>
 <li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
+<p>Remove the current monitoring tasks</p>
 </li>
 <li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
-</li>
-<li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
+<p>Add the following monitoring task:</p>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code>Generate Monitors {
+   monitoring for component VendingMachine {
+      trace directories "VendingMachineEventsFiles"
+   }
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Component monitoring checks the components constraints and all interfaces of the component.</p>
+</div>
 </li>
 </ul>
 </div>
 <div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
-</div>
+<p>Run monitoring and inspect the dashboard with the results in folder <em>comma-gen</em>.</p>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/tutorial/activity14.html
similarity index 83%
copy from site/download.html
copy to site/tutorial/activity14.html
index 1bafd3b..5525a05 100644
--- a/site/download.html
+++ b/site/tutorial/activity14.html
@@ -441,105 +441,30 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="../language/language.html">Language</a><ul class="sectlevel4"><li><a style="" href="../language/types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="../language/states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="../language/components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="font-weight: bold" href="activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_activity_14_define_additional_component_constraints"><a class="anchor" href="#_activity_14_define_additional_component_constraints"></a>Activity 14: Define additional component constraints</h2>
 <div class="sectionbody">
-<div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
-</div>
-<div class="ulist">
+<div class="ulist normal">
 <ul>
 <li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
+<p>Define a functional constraint for the vending machine component
+which expresses that each <em>Reset</em> on the service port is followed
+by a <em>ResetCoinChecker</em> on the coin check port.</p>
 </li>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
+<p>Define a time constraint (after heading <span class="purple"><strong>timing constraints</strong></span>)
+which expresses that a <em>CoinCheckerProblem</em> notification on the coin check port
+is followed by an <em>OutOfOrder</em> notification on the service port within 2 ms.</p>
 </li>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
+<p>Run monitoring and inspect the results.</p>
 </li>
 </ul>
 </div>
-</li>
-<li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
-</li>
-<li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
-</li>
-</ol>
-</div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
-</div>
-<div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
-<div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
-<div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
-<div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
-</li>
-<li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
-</li>
-<li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
-</li>
-<li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
-</div>
-</div>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/tutorial/activity2.html
similarity index 78%
copy from site/download.html
copy to site/tutorial/activity2.html
index 1bafd3b..db2a8cf 100644
--- a/site/download.html
+++ b/site/tutorial/activity2.html
@@ -441,104 +441,117 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="../language/language.html">Language</a><ul class="sectlevel4"><li><a style="" href="../language/types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="../language/states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="../language/components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="font-weight: bold" href="activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_activity_2_make_an_initial_specification_of_the_service_interface"><a class="anchor" href="#_activity_2_make_an_initial_specification_of_the_service_interface"></a>Activity 2: Make an initial specification of the service interface</h2>
 <div class="sectionbody">
-<div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
+<div class="paragraph normal">
+<p>The goal of this activity is to create an initial version of
+a state machine model for the service interface.
+Open file <em>IService.interface</em> and modify the dummy state machine such that
+it matches the following description:</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
+<p>Initially the vending machine only accepts the <em>SwitchOn</em> command,
+which leads to result OK and the machine becomes operational.</p>
+</li>
+<li>
+<p>When the machine is operational, it accepts command <em>LoadProduct</em>.
+Moreover it can be switched off by the <em>SwitchOff</em> signal.</p>
+</li>
+</ul>
+</div>
+<div class="admonitionblock tip">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-tip" title="Tip"></i>
+</td>
+<td class="content">
 <div class="ulist">
 <ul>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
+<p><strong>Ctrl-space</strong> provides templates for various types of transitions.</p>
 </li>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
+<p>Use <span class="maroon">reply</span> for a void command such as <em>LoadProduct</em>.</p>
 </li>
 </ul>
 </div>
-</li>
-<li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
-</li>
-<li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
-</li>
-</ol>
+</td>
+</tr>
+</table>
 </div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
-</div>
-<div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
 <div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
+<p>When ready with the state machine,
+extend the project file with a generator for UML diagrams as follows.<br>
+Open file <em>VendingMachine.prj</em>,
+place the cursor between the two brackets and
+use Ctrl-space to inspect the possible generators;
+select "Generate UML Block" by double clicking. Save the .prj file.</p>
 </div>
-</div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
 <div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
-<div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
+<p>Next right-click on file <em>VendingMachine.prj</em>
+(or somewhere in the editor of the file) and choose
+"Execute CommaSuite Workflow".</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
+<p>In the lower right corner there is an indication in green while the workflow is
+being executed.</p>
 </li>
 <li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
+<p>When finished, the result can be inspected in folder <em>src-gen/uml</em>.</p>
 </li>
 <li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
+<p>Since the project file contains a task to generate UML, the CommaSuite tool
+generates UML state machine diagrams in the form of</p>
+<div class="ulist">
+<ul>
+<li>
+<p><em>.png</em> files; note that there are reduced version of the state machine
+which is convenient for large state machines</p>
 </li>
 <li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
+<p><em>.plantUML</em> files; to show the diagram,</p>
+<div class="ulist">
+<ul>
+<li>
+<p>open the file (in case a pop-up occurs, select "Associate '*.plantuml' files
+with the current editor &#8230;&#8203; ")</p>
+</li>
+<li>
+<p>open the PlantUML view; go to menu Window/Show View/Other&#8230;&#8203; ,
+expand the <em>PlantUML</em> folder and choose <em>PlantUML</em>.<br></p>
+<div class="admonitionblock tip">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-tip" title="Tip"></i>
+</td>
+<td class="content">
+<div class="paragraph">
+<p>PlantUML files are displayed using Graphviz. Sometimes showing the correct diagram requires a few repeated clicks in source and view.
+If diagrams are not displayed, check the installation manual on the GraphViz installation.</p>
+</div>
+</td>
+</tr>
+</table>
+</div>
 </li>
 </ul>
 </div>
-<div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
+</li>
+</ul>
 </div>
+</li>
+</ul>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/tutorial/activity3.html
similarity index 78%
copy from site/download.html
copy to site/tutorial/activity3.html
index 1bafd3b..ec26bde 100644
--- a/site/download.html
+++ b/site/tutorial/activity3.html
@@ -441,104 +441,99 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="../language/language.html">Language</a><ul class="sectlevel4"><li><a style="" href="../language/types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="../language/states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="../language/components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="font-weight: bold" href="activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_activity_3_check_an_execution_trace_against_the_state_machine"><a class="anchor" href="#_activity_3_check_an_execution_trace_against_the_state_machine"></a>Activity 3: Check an execution trace against the state machine</h2>
 <div class="sectionbody">
+<div class="paragraph normal">
+<p>Once the initial state machine model is defined,
+an execution trace like <em>VendingMachine.events</em> can be checked for
+conformance against this model.
+First create in the main project directory
+a folder <em>VendingMachineEventsFiles</em> by<br></p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>File &gt; New &gt; Folder ; choose Vending Machine Example as parent</pre>
+</div>
+</div>
 <div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
+<p>Next extend <em>VendingMachine.prj</em> with a task
+to generate the monitoring (you may copy the text below):</p>
 </div>
-<div class="ulist">
-<ul>
-<li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
-</li>
-</ul>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code>Generate Monitors {
+   monitoringIService for interface IService {
+     trace directories "VendingMachineEventsFiles"
+   }
+}</code></pre>
 </div>
-</li>
-<li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
+</div>
+<div class="paragraph">
+<p>The lay-out can be improved by means of <em>&lt;CTRL&gt;-&lt;SHIFT&gt;-F</em>.
+Next perform the following steps:</p>
+</div>
 <div class="olist arabic">
 <ol class="arabic">
 <li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
+<p>Execute again the steps from Activity 1 by just switching on and off
+the machine a couple of times and performing <em>LoadProducts</em>.
+Do not perform any other actions!
+These actions are recorded in file <em>VendingMachine.events</em>.</p>
 </li>
 <li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
+<p>Rename file <em>VendingMachine.events</em> to <em>VendingMachine1.events</em>
+(use right-click on the file &gt; Rename) and
+move it to folder <em>VendingMachineEventsFiles</em>.</p>
 </li>
 <li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
+<p>Construct a few more .event files, including a few that
+do not conform to the specification, and move them also
+to folder <em>VendingMachineEventsFiles</em> after renaming.</p>
 </li>
 <li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
-</li>
-</ol>
-</div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
-</div>
-<div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
-<div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
-<div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
-<div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
-</div>
+<p>Right-click on file <em>VendingMachine.prj</em> and
+choose "Run As &gt; CommaSuite Generation and Monitoring"<em>.</em>
+The check is executed and results are produced.</p>
 <div class="ulist">
 <ul>
 <li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
+<p>In order to view the results of monitoring,
+see file <em>dashboard.html</em> in
+folder <em>comma-gen</em>.
+It contains information about errors and warnings.</p>
+<div class="ulist">
+<ul>
+<li>
+<p>As soon as the monitoring detects that a .events file
+does not conform to the state machine of the interface,
+an error is generated and monitoring of this files terminates.</p>
 </li>
 <li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
-</li>
-<li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
-</li>
-<li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
+<p>Later we will also define time and data constraints;
+violations of these constraints are reported as warnings
+and monitoring continues.</p>
 </li>
 </ul>
 </div>
-<div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
+</li>
+<li>
+<p>The dashboard also provides coverage information;
+in each state the transitions are numbered in the order of
+occurrence and the dashboard describes for each transition
+how often it was used during monitoring.
+If a transition contains multiple clauses (by mean of the "OR" construct)
+then also the clauses are numbered.
+The dashboard also reports the percentage of covered transitions and states.</p>
+</li>
+</ul>
 </div>
+</li>
+</ol>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/tutorial/activity4.html
similarity index 81%
copy from site/download.html
copy to site/tutorial/activity4.html
index 1bafd3b..4fef885 100644
--- a/site/download.html
+++ b/site/tutorial/activity4.html
@@ -441,104 +441,59 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="../language/language.html">Language</a><ul class="sectlevel4"><li><a style="" href="../language/types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="../language/states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="../language/components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="font-weight: bold" href="activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_activity_4_extend_the_specification_of_the_service_interface"><a class="anchor" href="#_activity_4_extend_the_specification_of_the_service_interface"></a>Activity 4: Extend the specification of the service interface</h2>
 <div class="sectionbody">
-<div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
-</div>
+<div class="olist arabic normal">
+<ol class="arabic">
+<li>
+<p>Extend the specification in <em>IService.interface</em> with the remaining part
+of the signature according to the following informal description:</p>
 <div class="ulist">
 <ul>
 <li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
+<p>At any point in time, the vending machine may send an <em>OutOfOrder</em> notification
+(indicating some internal problem), going into error mode.
+Note that such an autonomous action of the server can be modelled as
+a transition without trigger and a notification in the "do"-part.</p>
 </li>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
+<p>In error mode, the <em>SwitchOn</em> command fails and the commands to switch
+off and load product have no effect.</p>
 </li>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
+<p>In error mode, the <em>Reset</em> command may bring the vending machine
+to the initial state where it is off.
+There is also a possibility that the <em>Reset</em> command fails.
+The <em>Reset</em> command is not allowed outside error mode.</p>
 </li>
 </ul>
 </div>
 </li>
-<li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
-</li>
-<li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
-</li>
 </ol>
 </div>
-</li>
+<div class="olist arabic">
+<ol class="arabic" start="2">
 <li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
-</div>
-<div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
-<div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
-<div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
-<div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
-</div>
+<p>Use monitoring to check the correctness of the IService specification
+with respect to the implementation:</p>
 <div class="ulist">
 <ul>
 <li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
+<p>To generate an <em>OutOfOrder</em> notification, click the <em>CoinChecker</em> Problem
+button of the coin checker interface.</p>
 </li>
 <li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
-</li>
-<li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
-</li>
-<li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
+<p>After a <em>Reset</em>, select the result.</p>
 </li>
 </ul>
 </div>
-<div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
-</div>
+</li>
+</ol>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/tutorial/activity5.html
similarity index 81%
copy from site/download.html
copy to site/tutorial/activity5.html
index 1bafd3b..f530f9c 100644
--- a/site/download.html
+++ b/site/tutorial/activity5.html
@@ -441,104 +441,55 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="../language/language.html">Language</a><ul class="sectlevel4"><li><a style="" href="../language/types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="../language/states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="../language/components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="font-weight: bold" href="activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_activity_5_add_a_time_constraint"><a class="anchor" href="#_activity_5_add_a_time_constraint"></a>Activity 5: Add a time constraint</h2>
 <div class="sectionbody">
-<div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
+<div class="paragraph normal">
+<p>Interface specifications can be extended with constraints on time and data.</p>
 </div>
-<div class="ulist">
-<ul>
-<li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
-</li>
-</ul>
-</div>
-</li>
-<li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
 <div class="olist arabic">
 <ol class="arabic">
 <li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
-</li>
-<li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
+<p>As example, after the state machine in <em>IService.interface</em>,
+add the following time constraint with name <em>loadProduct_reply</em> :</p>
 </li>
 </ol>
 </div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
+<div class="listingblock">
+<div class="content">
+<pre>timing constraints
+loadProduct_reply
+command LoadProduct - [ 1000.0 ms .. 1100.0 ms ] -&gt; reply to command LoadProduct</pre>
 </div>
-<div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
-<div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
-<div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
-<div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
-</li>
-<li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
-</li>
-<li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
-</li>
-<li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
-</li>
-</ul>
 </div>
 <div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
+<p>It specifies that after a command <em>LoadProduct</em>,
+the reply to this command should occur in the interval [1000, 1100],
+so after 1000 ms and before 1100 ms have elapsed.
+Note that a real is denoted in CommaSuite with a dot, e.g. 7.0, or
+exponential notation, e.g. 3.4e-5.</p>
 </div>
+<div class="olist arabic">
+<ol class="arabic" start="2">
+<li>
+<p>Use the GUI to create a .event file where the command <em>LoadProduct</em>
+is called a number of times,
+e.g. interleaved with other events.</p>
+</li>
+<li>
+<p>Run the monitoring and inspect the results; note that violations
+to time constraints lead to warnings.</p>
+</li>
+<li>
+<p>When a trace is checked against time constraints, statistical information is collected.
+This information can also be found in file <em>dashboard.html</em> in
+folder <em>comma-gen</em>.</p>
+</li>
+</ol>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/tutorial/activity6.html
similarity index 82%
copy from site/download.html
copy to site/tutorial/activity6.html
index 1bafd3b..c1cdf50 100644
--- a/site/download.html
+++ b/site/tutorial/activity6.html
@@ -441,104 +441,45 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="../language/language.html">Language</a><ul class="sectlevel4"><li><a style="" href="../language/types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="../language/states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="../language/components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="font-weight: bold" href="activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_activity_6_documentation_generation"><a class="anchor" href="#_activity_6_documentation_generation"></a>Activity 6: Documentation generation</h2>
 <div class="sectionbody">
-<div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
+<div class="paragraph normal">
+<p>To obtain documentation, first obtain the template as follows.</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
-</li>
-</ul>
-</div>
-</li>
-<li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
-</li>
-<li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
-</li>
-</ol>
-</div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
-</div>
-<div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
-<div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
-<div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
-<div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
-</li>
-<li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
-</li>
-<li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
-</li>
-<li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
+<p>Right-click on <em>VendingMachine.prj</em> and select "Import Documentation Template";
+this adds a file <em>Template.docx</em>. (Use Refresh / F5 on the project if the file is not visible.)</p>
 </li>
 </ul>
 </div>
 <div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
+<p>Next extend <em>VendingMachine.prj</em> with the following task for document generation:</p>
 </div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code>Generate Documentations {
+    documentationTask for interface IService {
+        template = "Template.docx"
+        targetFile = "Documentation.docx"
+        author = "John Smith"
+        role = "R&amp;D: SW Designer"
+    }
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Execute the CommaSuite workflow (right click on the <em>.prj</em> file and select Execute CommaSuite Workflow).
+Next navigate to folder <em>src-gen/doc/</em> and
+open the generated <em>.docx</em> file.
+It contains information from the comments in the <em>.signature</em> and <em>.interface</em> files.
+In addition, the simple state machine is presented in a table form.</p>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/tutorial/activity6Philips.html
similarity index 82%
copy from site/download.html
copy to site/tutorial/activity6Philips.html
index 1bafd3b..78f5cac 100644
--- a/site/download.html
+++ b/site/tutorial/activity6Philips.html
@@ -441,104 +441,44 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="../language/language.html">Language</a><ul class="sectlevel4"><li><a style="" href="../language/types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="../language/states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="../language/components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_activity_6_documentation_generation_for_the_philips_version"><a class="anchor" href="#_activity_6_documentation_generation_for_the_philips_version"></a>Activity 6: Documentation Generation <em>for the Philips version</em></h2>
 <div class="sectionbody">
-<div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
+<div class="paragraph normal">
+<p>To obtain documentation for the Philips version of the tooling, first obtain the template as follows.</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
-</li>
-</ul>
-</div>
-</li>
-<li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
-</li>
-<li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
-</li>
-</ol>
-</div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
-</div>
-<div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
-<div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
-<div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
-<div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
-</li>
-<li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
-</li>
-<li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
-</li>
-<li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
+<p>Right-click on <em>VendingMachine.prj</em> and select "Import Philips Template";
+this adds a file <em>Template.docx</em>.</p>
 </li>
 </ul>
 </div>
 <div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
+<p>Next extend <em>VendingMachine.prj</em> with the following task for document generation:</p>
 </div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code>Generate Documentations {
+  documentationTask for interface IService {
+     template = "Template.docx"
+     DHF = 123456
+     author = "John Smith"
+-    role = "R&amp;D: SW Designer"
+  }
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Execute the CommaSuite workflow and next navigate to folder <em>src-gen/doc/</em> and
+open the generated <em>.docx</em> file.
+It contains information from the comments in the <em>.signature</em> and <em>.interface</em> files.
+In addition, the simple state machine is presented in a table form.</p>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/tutorial/activity7.html
similarity index 83%
copy from site/download.html
copy to site/tutorial/activity7.html
index 1bafd3b..494353b 100644
--- a/site/download.html
+++ b/site/tutorial/activity7.html
@@ -441,105 +441,33 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="../language/language.html">Language</a><ul class="sectlevel4"><li><a style="" href="../language/types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="../language/states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="../language/components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="font-weight: bold" href="activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_activity_7_state_machine_of_the_coin_checker"><a class="anchor" href="#_activity_7_state_machine_of_the_coin_checker"></a>Activity 7: State machine of the coin checker</h2>
 <div class="sectionbody">
-<div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
+<div class="paragraph normal">
+<p>Adapt the state machine based on the following information:</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
+<p>In the initial state only command <em>CheckCoin</em> can be accepted,
+which results in a reply indicating that the coin is accepted or not accepted.</p>
 </li>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
+<p>At any moment, the coin checker may generate a <em>CoinCheckerProblem</em> notification
+after which the coin checker is in error mode.</p>
 </li>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
+<p>The <em>ResetCoinChecker</em> command is only allowed in the error mode;
+it may be successful, leading to the initial state or fail
+(then the coin checker stays in error mode).</p>
 </li>
 </ul>
 </div>
-</li>
-<li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
-</li>
-<li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
-</li>
-</ol>
-</div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
-</div>
-<div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
-<div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
-<div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
-<div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
-</li>
-<li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
-</li>
-<li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
-</li>
-<li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
-</div>
-</div>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/tutorial/activity8.html
similarity index 81%
copy from site/download.html
copy to site/tutorial/activity8.html
index 1bafd3b..93123cd 100644
--- a/site/download.html
+++ b/site/tutorial/activity8.html
@@ -441,105 +441,50 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="../language/language.html">Language</a><ul class="sectlevel4"><li><a style="" href="../language/types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="../language/states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="../language/components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="font-weight: bold" href="activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_activity_8_check_the_specified_interfaces_by_monitoring"><a class="anchor" href="#_activity_8_check_the_specified_interfaces_by_monitoring"></a>Activity 8: Check the specified interfaces by monitoring</h2>
 <div class="sectionbody">
-<div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
+<div class="ulist normal">
+<ul>
+<li>
+<p>Extend the project file <em>VendingMachine.prj</em> with an import of <em>ICoinCheck.interface.</em></p>
+</li>
+<li>
+<p>Add a monitoring task as follows:</p>
+</li>
+</ul>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code>Generate Monitors {
+   monitoringIService for interface IService {
+      trace directories "VendingMachineEventsFiles"
+   }
+   monitoringICoinCheck for interface ICoinCheck {
+      trace directories "VendingMachineEventsFiles"
+   }
+}</code></pre>
+</div>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
+<p>Use the GUI to generate a few .event files using commands from the service interface
+and the possibility to generate coin check problem using the coin checker interface.
+Observe that the Reset operation of the service interface requires the selection of a result.</p>
 </li>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
+<p>Apply monitoring (right-click on <em>VendingMachine.prj</em> and
+choose "Run As &gt; CommaSuite Generation and Monitoring") to check all <em>.event</em> files.
+Inspect the result in folder <em>comma-gen</em>.
+Improve the state machine when monitoring reports errors.</p>
 </li>
 </ul>
 </div>
-</li>
-<li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
-</li>
-<li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
-</li>
-</ol>
-</div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
-</div>
-<div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
-<div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
-<div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
-<div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
-</li>
-<li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
-</li>
-<li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
-</li>
-<li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
-</div>
-</div>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/tutorial/activity9.html
similarity index 79%
copy from site/download.html
copy to site/tutorial/activity9.html
index 1bafd3b..7f3c231 100644
--- a/site/download.html
+++ b/site/tutorial/activity9.html
@@ -441,104 +441,104 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="../language/language.html">Language</a><ul class="sectlevel4"><li><a style="" href="../language/types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="../language/states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="../language/components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="font-weight: bold" href="activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_activity_9_state_machine_of_the_user_interface"><a class="anchor" href="#_activity_9_state_machine_of_the_user_interface"></a>Activity 9: State machine of the user interface</h2>
 <div class="sectionbody">
-<div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
+<div class="paragraph normal">
+<p>To specify the behavior of the interface, first define and initialize two variables:</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
+<p>a variable of type <em>integer</em> to represent the credit of the user, initialize it to 0;</p>
+</li>
+<li>
+<p>a variable of type <em>pricesMap</em> (see <em>VendingMachine.types</em>) to represent
+the prices of the product, where cola costs 3, juice costs 2, and water costs 1.<br></p>
+</li>
+</ul>
+</div>
+<div class="exampleblock">
+<div class="content">
 <div class="ulist">
 <ul>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
+<p>The Tutorial Example contains an example of maps.</p>
 </li>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
+<p>See also <a href="../language/expressions.html">statements and expressions</a>.</p>
+</li>
+</ul>
+</div>
+</div>
+</div>
+<div class="paragraph">
+<p>Next define the state machine of the IUser interface according to the following description:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>In the initial state, when there is no credit, only command <em>InsertCoin</em> is allowed.
+This command has an output parameter representing the credit when the command
+has been completed.
+This is specified as the first parameter in the reply,
+where the second one is of type <em>CoinResult</em>.<br></p>
+</li>
+</ul>
+</div>
+<div class="exampleblock">
+<div class="content">
+<div class="paragraph">
+<p>See the notes and example about a reply in <a href="../language/transitions.html">transitions</a>.</p>
+</div>
+</div>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><em>InsertCoin</em> may have three possible results:</p>
+<div class="ulist">
+<ul>
+<li>
+<p>The coin is accepted and the credit is increased by one.</p>
 </li>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
+<p>The coin is not accepted and the credit is not changed.</p>
+</li>
+<li>
+<p>The machine is not operational; in this case the value of
+the out parameter is not specified, that is, any value is allowed.</p>
 </li>
 </ul>
 </div>
 </li>
 <li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
-</li>
-<li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
-</li>
-</ol>
-</div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
-</div>
-<div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
-<div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
-<div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
-<div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
-</div>
+<p>When the credit is positive, <em>ReturnMoney</em> is allowed, returning the total amount of credit.
+Finally, the command <em>OrderProduct</em> is allowed, which may
+have a number of possible responses:</p>
 <div class="ulist">
 <ul>
 <li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
+<p>NOT_OPERATIONAL to indicate the machine is not operational</p>
 </li>
 <li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
+<p>NOT_ENOUGH_MONEY to indicate that the credit is not sufficient</p>
 </li>
 <li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
+<p>NO_PRODUCTS_AVAILABLE to indicate that the credit is sufficient,
+but no products are available</p>
 </li>
 <li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
+<p>DELIVERED to indicate that the credit is sufficient and the product is delivered</p>
 </li>
 </ul>
 </div>
-<div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
-</div>
+</li>
+</ul>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/tutorial/activitySSCFPhilips.html
similarity index 82%
copy from site/download.html
copy to site/tutorial/activitySSCFPhilips.html
index 1bafd3b..bba9f5e 100644
--- a/site/download.html
+++ b/site/tutorial/activitySSCFPhilips.html
@@ -441,104 +441,37 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="../language/language.html">Language</a><ul class="sectlevel4"><li><a style="" href="../language/types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="../language/states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="../language/components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_activity_sscf_sscf_generation_only_for_the_philips_version"><a class="anchor" href="#_activity_sscf_sscf_generation_only_for_the_philips_version"></a>Activity SSCF: SSCF Generation <em>only for the Philips version</em></h2>
 <div class="sectionbody">
-<div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
+<div class="paragraph normal">
+<p>Extend <em>VendingMachine.prj</em> with the following task for SSCF generation:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code>Generate CPP {
+   cppTask for interface IService
+}</code></pre>
+</div>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
-</li>
-</ul>
-</div>
-</li>
-<li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
-</li>
-<li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
-</li>
-</ol>
-</div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
-</div>
-<div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
-<div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
-<div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
-<div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
-</li>
-<li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
-</li>
-<li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
-</li>
-<li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
+<p>Execute the CommaSuite workflow and navigate to folder <em>src-gen/cpp11</em>.
+It contains the generated C proxy code following the SSCF conventions.
+Code for C 98 is generated in folder <em>src-gen/cpp98</em>.</p>
 </li>
 </ul>
 </div>
 <div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
-</div>
+<p>Also CLI code can be generated. When the specification includes user defined primitive types
+that are not based on a CommaSuite primitive type, or when CommaSuite primitive types
+such as <em>real</em>, <em>string</em> or <em>integer</em> need to be mapped to custom implementation types,
+then a type mapping task is needed. See the CommaSuite help for more information.</p>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/tutorial/coincheckinterface.html
similarity index 83%
copy from site/download.html
copy to site/tutorial/coincheckinterface.html
index 1bafd3b..801b34d 100644
--- a/site/download.html
+++ b/site/tutorial/coincheckinterface.html
@@ -441,105 +441,32 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="../language/language.html">Language</a><ul class="sectlevel4"><li><a style="" href="../language/types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="../language/states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="../language/components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="font-weight: bold" href="coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_specify_the_coin_checker_interface"><a class="anchor" href="#_specify_the_coin_checker_interface"></a>Specify the coin checker interface</h2>
 <div class="sectionbody">
+<div class="paragraph normal">
+<p>In this section the required ICoinCheck interface is specified.
+To avoid long execution times, the <em>VendingMachine.prj</em> file might be simplified
+such that it only contains the monitoring task for the IService interface.</p>
+</div>
 <div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
+<p>Folder ICoinCheck already contains the following files:</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
+<p><em>ICoinCheck.signature</em> with the signature of the coin checker.</p>
 </li>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
+<p><em>ICoinCheck.interface</em> with a dummy state machine that will
+be extended in the following activities.</p>
 </li>
 </ul>
 </div>
-</li>
-<li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
-</li>
-<li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
-</li>
-</ol>
-</div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
-</div>
-<div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
-<div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
-<div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
-<div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
-</li>
-<li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
-</li>
-<li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
-</li>
-<li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
-</div>
-</div>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/tutorial/componentmodel.html
similarity index 82%
copy from site/download.html
copy to site/tutorial/componentmodel.html
index 1bafd3b..d1e53a0 100644
--- a/site/download.html
+++ b/site/tutorial/componentmodel.html
@@ -441,103 +441,28 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="../language/language.html">Language</a><ul class="sectlevel4"><li><a style="" href="../language/types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="../language/states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="../language/components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="font-weight: bold" href="componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_specify_a_component"><a class="anchor" href="#_specify_a_component"></a>Specify a component</h2>
 <div class="sectionbody">
-<div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
-</li>
-</ul>
-</div>
-</li>
-<li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
-</li>
-<li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
-</li>
-</ol>
-</div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
+<div class="paragraph normal">
+<p>The actions in this section illustrate the specification of a
+component with provided and required interfaces.
+Also relations between these interfaces can be expressed.</p>
 </div>
 <div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
+<h3 id="_add_component_constraints"><a class="anchor" href="#_add_component_constraints"></a>Add component constraints</h3>
 <div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
-<div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
-<div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
-</li>
-<li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
-</li>
-<li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
-</li>
-<li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
-</li>
-</ul>
+<p>Constraints on relations between events of different interfaces can be expressed
+in a CommaSuite component specifications with extension .component.
+As an illustration we consider the vending machine component with interfaces
+as depicted in the figure below.</p>
 </div>
 <div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
+<p><span class="image"><img src="../img/image3.png" alt="image" width="500" height="250"></span></p>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/tutorial/concludingremarks.html
similarity index 83%
copy from site/download.html
copy to site/tutorial/concludingremarks.html
index 1bafd3b..21526a8 100644
--- a/site/download.html
+++ b/site/tutorial/concludingremarks.html
@@ -441,104 +441,18 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="../language/language.html">Language</a><ul class="sectlevel4"><li><a style="" href="../language/types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="../language/states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="../language/components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="font-weight: bold" href="concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_concluding_remarks"><a class="anchor" href="#_concluding_remarks"></a>Concluding remarks</h2>
 <div class="sectionbody">
-<div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
-</li>
-</ul>
-</div>
-</li>
-<li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
-</li>
-<li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
-</li>
-</ol>
-</div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
-</div>
-<div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
-<div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
-<div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
-<div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
-</li>
-<li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
-</li>
-<li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
-</li>
-<li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
-</div>
+<div class="paragraph normal">
+<p>Monitoring is supported by command-line tooling that can be integrated.
+For instance, to perform monitoring after smoke tests automatically.
+See the CommaSuite User Guide for a description of the
+<a href="../commandline/commandline.html">command line tool</a>.</p>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/tutorial/intro.html
similarity index 79%
copy from site/download.html
copy to site/tutorial/intro.html
index 1bafd3b..094a7d6 100644
--- a/site/download.html
+++ b/site/tutorial/intro.html
@@ -441,104 +441,92 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="../language/language.html">Language</a><ul class="sectlevel4"><li><a style="" href="../language/types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="../language/states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="../language/components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="font-weight: bold" href="intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_tutorial"><a class="anchor" href="#_tutorial"></a>Tutorial</h2>
 <div class="sectionbody">
+<div class="paragraph normal">
+<p>This tutorial assumes that the tool installation has been completed.
+The goal of this tutorial is to get experience with interface modeling and
+the use of the generator facilities of the CommaSuite tooling.
+See the User Guide for a short
+<a href="../overview/intro.html">introduction</a>
+to the CommaSuite framework.</p>
+</div>
+<div class="sect2">
+<h3 id="_case_study"><a class="anchor" href="#_case_study"></a>Case study</h3>
 <div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
+<p>As a case study, we consider a simple <em>vending machine</em> implemented in Java.
+There is a GUI that can be used to interact with the vending machine.
+During the workshop, the interface <em>behavior</em> of the vending machine component
+will be specified using CommaSuite.
+The interaction between the GUI and the vending machine will be
+recorded in a trace file.
+Using a generated monitor it can be checked
+if this trace conforms to the specified behavior.
+In addition, the tutorial addresses the generation of other artefacts such
+as UML diagrams and documentation.</p>
+</div>
+<div class="paragraph">
+<p>The vending machine is a component with three interfaces,
+as shown in the figure below:</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
+<p>A provided interface for users to insert money, order products and get money back.</p>
+</li>
+<li>
+<p>A provided service interface to switch the machine on and off, and to load products.</p>
+</li>
+<li>
+<p>A required interface to check coins.
+The coin check component which provides this interface may raise an error,
+called CoinCheckerProblem, and it can be reset.</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p><span class="image"><img src="../img/image3.png" alt="image" width="500" height="250"></span></p>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_resources_for_additional_support"><a class="anchor" href="#_resources_for_additional_support"></a>Resources for additional support</h3>
+<div class="paragraph">
+<p>There are several resources for additional support:</p>
+</div>
 <div class="ulist">
 <ul>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
+<p><a href="../shortcuts/shortcuts.html">Shortcuts</a> provides an overview of Eclipse commands and shortcuts.
+For instance:</p>
+<div class="ulist">
+<ul>
+<li>
+<p><strong><em>&lt;CTRL&gt;-&lt;SPACE&gt;</em></strong> for content assist.</p>
 </li>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
+<p><strong><em>&lt;CTRL&gt;-&lt;SHIFT&gt;-F</em></strong> for automatic formatting</p>
 </li>
 </ul>
 </div>
 </li>
 <li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
+<p>The CommaSuite User Guide Eclipse: go to menu Help &gt; Help Contents,
+section CommaSuite User Guide or use F1.</p>
 </li>
 <li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
+<p>Available example(s): File &gt; New &gt; Example.
+Most relevant for this tutorial is the Tutorial Example.</p>
 </li>
 <li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
-</li>
-</ol>
-</div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
+<p>In case of problems, consult the <a href="../problems/problemsolving.html">problems solving</a> part of the tutorial.</p>
 </li>
 </ul>
 </div>
-<div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
-<div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
-<div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
-<div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
-</li>
-<li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
-</li>
-<li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
-</li>
-<li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
-</div>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/tutorial/preparation.html
similarity index 81%
copy from site/download.html
copy to site/tutorial/preparation.html
index 1bafd3b..74b8f73 100644
--- a/site/download.html
+++ b/site/tutorial/preparation.html
@@ -441,105 +441,80 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="../language/language.html">Language</a><ul class="sectlevel4"><li><a style="" href="../language/types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="../language/states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="../language/components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="font-weight: bold" href="preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_preparation_for_the_vending_machine_interfaces"><a class="anchor" href="#_preparation_for_the_vending_machine_interfaces"></a>Preparation for the vending machine interfaces</h2>
 <div class="sectionbody">
-<div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
+<div class="paragraph normal">
+<p>This section contains a number of activities to prepare the definition of
+state machines for the interfaces of the vending machine.</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
+<p>Create a folder <em>"Tutorial"</em> at a high level in your folder structure.</p>
 </li>
 </ul>
 </div>
-</li>
-<li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
-</li>
-<li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
-</li>
-</ol>
-</div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
-</div>
-<div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
+<div class="admonitionblock warning">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-warning" title="Warning"></i>
+</td>
+<td class="content">
 <div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
+<p>A deeply nested folder leads
+to avoid long path names which might create problems.</p>
 </div>
-</div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
-<div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
-<div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
+</td>
+</tr>
+</table>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
+<p>Start Eclipse with the created folder <em>Tutorial</em> as workspace.</p>
 </li>
 <li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
-</li>
-<li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
-</li>
-<li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
+<p>Get the vending machine example, which contains the starting point for the exercises,
+by<br></p>
 </li>
 </ul>
 </div>
-<div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
+<div class="listingblock">
+<div class="content">
+<pre>File &gt; New &gt; Example ; select Vending Machine Example ; Finish</pre>
 </div>
 </div>
+<div class="paragraph">
+<p>The project contains:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>A <em>src</em> folder with the Java implementation and a GUI of the vending machine.</p>
+</li>
+<li>
+<p>File <em>VendingMachine.types</em> which defines a number of types,
+in addition to the predefined types such as bool, int, real, and string.</p>
+</li>
+<li>
+<p>The bin folder of the</p>
+</li>
+<li>
+<p>Folders <em>ICoinCheck</em>,  <em>IService</em>, and <em>IUser</em> which contain the starting points for the interface specifications.
+They will be completed by the activities in this tutorial.</p>
+</li>
+<li>
+<p>File <em>VendingMachine.prj</em> in which generator tasks will be specified.
+Files with this extension should always be placed in the main project folder.</p>
+</li>
+</ul>
+</div>
 </div>
 </div>
 </div>
diff --git a/site/download.html b/site/tutorial/serviceinterface.html
similarity index 82%
copy from site/download.html
copy to site/tutorial/serviceinterface.html
index 1bafd3b..23a7016 100644
--- a/site/download.html
+++ b/site/tutorial/serviceinterface.html
@@ -441,105 +441,38 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="../language/language.html">Language</a><ul class="sectlevel4"><li><a style="" href="../language/types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="../language/states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="../language/components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="font-weight: bold" href="serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_specify_the_service_interface"><a class="anchor" href="#_specify_the_service_interface"></a>Specify the service interface</h2>
 <div class="sectionbody">
-<div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
+<div class="paragraph normal">
+<p>Folder <em>IService</em> contains:</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
+<p>File <em>IService.signature</em> which defines the signature of the IService interface.<br>
+Note that the file imports the .types file.
+In general, the names of imported .types files must be different from the signature
+file name (to avoid potential name clashes in generated code).
+The doxygen-style tags in the comments will be used for document generation,
+as explained later.</p>
 </li>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
+<p>File <em>IService.interface</em> with a dummy state machine. <br>
+Note that there are warnings about unused messages from the signature.
+By means of the activities in this tutorial, the state machine will gradually be completed
+for these messages.
+In general, a state machine describes the interface protocol from the viewpoint of
+server, i.e. which commands and signals can it receive in any state and
+which notifications it is allowed to send.
+Messages that are not specified are not allowed.</p>
 </li>
 </ul>
 </div>
-</li>
-<li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
-</li>
-<li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
-</li>
-</ol>
-</div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
-</div>
-<div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
-<div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
-<div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
-<div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
-</li>
-<li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
-</li>
-<li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
-</li>
-<li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
-</div>
-</div>
 </div>
 </div>
 </div>
diff --git a/site/tutorial/tutorial.html b/site/tutorial/tutorial.html
new file mode 100644
index 0000000..c195c07
--- /dev/null
+++ b/site/tutorial/tutorial.html
@@ -0,0 +1,1574 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<meta name="generator" content="Asciidoctor 2.0.15">
+<link rel="icon" type="image/png" href="/favicon.png">
+<title>Eclipse CommaSuite</title>
+<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700">
+<style>
+/* Asciidoctor default stylesheet | MIT License | https://asciidoctor.org */
+/* Uncomment @import statement to use as custom stylesheet */
+/*@import "https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700";*/
+article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}
+audio,video{display:inline-block}
+audio:not([controls]){display:none;height:0}
+html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}
+a{background:none}
+a:focus{outline:thin dotted}
+a:active,a:hover{outline:0}
+h1{font-size:2em;margin:.67em 0}
+abbr[title]{border-bottom:1px dotted}
+b,strong{font-weight:bold}
+dfn{font-style:italic}
+hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}
+mark{background:#ff0;color:#000}
+code,kbd,pre,samp{font-family:monospace;font-size:1em}
+pre{white-space:pre-wrap}
+q{quotes:"\201C" "\201D" "\2018" "\2019"}
+small{font-size:80%}
+sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}
+sup{top:-.5em}
+sub{bottom:-.25em}
+img{border:0}
+svg:not(:root){overflow:hidden}
+figure{margin:0}
+fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}
+legend{border:0;padding:0}
+button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}
+button,input{line-height:normal}
+button,select{text-transform:none}
+button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}
+button[disabled],html input[disabled]{cursor:default}
+input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}
+button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}
+textarea{overflow:auto;vertical-align:top}
+table{border-collapse:collapse;border-spacing:0}
+*,*::before,*::after{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}
+html,body{font-size:100%}
+body{background:#fff;color:rgba(0,0,0,.8);padding:0;margin:0;font-family:"Noto Serif","DejaVu Serif",serif;font-weight:400;font-style:normal;line-height:1;position:relative;cursor:auto;tab-size:4;word-wrap:anywhere;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased}
+a:hover{cursor:pointer}
+img,object,embed{max-width:100%;height:auto}
+object,embed{height:100%}
+img{-ms-interpolation-mode:bicubic}
+.left{float:left!important}
+.right{float:right!important}
+.text-left{text-align:left!important}
+.text-right{text-align:right!important}
+.text-center{text-align:center!important}
+.text-justify{text-align:justify!important}
+.hide{display:none}
+img,object,svg{display:inline-block;vertical-align:middle}
+textarea{height:auto;min-height:50px}
+select{width:100%}
+.subheader,.admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{line-height:1.45;color:#7a2518;font-weight:400;margin-top:0;margin-bottom:.25em}
+div,dl,dt,dd,ul,ol,li,h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6,pre,form,p,blockquote,th,td{margin:0;padding:0}
+a{color:#2156a5;text-decoration:underline;line-height:inherit}
+a:hover,a:focus{color:#1d4b8f}
+a img{border:0}
+p{font-family:inherit;font-weight:400;font-size:1em;line-height:1.6;margin-bottom:1.25em;text-rendering:optimizeLegibility}
+p aside{font-size:.875em;line-height:1.35;font-style:italic}
+h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{font-family:"Open Sans","DejaVu Sans",sans-serif;font-weight:300;font-style:normal;color:#ba3925;text-rendering:optimizeLegibility;margin-top:1em;margin-bottom:.5em;line-height:1.0125em}
+h1 small,h2 small,h3 small,#toctitle small,.sidebarblock>.content>.title small,h4 small,h5 small,h6 small{font-size:60%;color:#e99b8f;line-height:0}
+h1{font-size:2.125em}
+h2{font-size:1.6875em}
+h3,#toctitle,.sidebarblock>.content>.title{font-size:1.375em}
+h4,h5{font-size:1.125em}
+h6{font-size:1em}
+hr{border:solid #dddddf;border-width:1px 0 0;clear:both;margin:1.25em 0 1.1875em;height:0}
+em,i{font-style:italic;line-height:inherit}
+strong,b{font-weight:bold;line-height:inherit}
+small{font-size:60%;line-height:inherit}
+code{font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;font-weight:400;color:rgba(0,0,0,.9)}
+ul,ol,dl{font-size:1em;line-height:1.6;margin-bottom:1.25em;list-style-position:outside;font-family:inherit}
+ul,ol{margin-left:1.5em}
+ul li ul,ul li ol{margin-left:1.25em;margin-bottom:0;font-size:1em}
+ul.square li ul,ul.circle li ul,ul.disc li ul{list-style:inherit}
+ul.square{list-style-type:square}
+ul.circle{list-style-type:circle}
+ul.disc{list-style-type:disc}
+ol li ul,ol li ol{margin-left:1.25em;margin-bottom:0}
+dl dt{margin-bottom:.3125em;font-weight:bold}
+dl dd{margin-bottom:1.25em}
+abbr,acronym{text-transform:uppercase;font-size:90%;color:rgba(0,0,0,.8);border-bottom:1px dotted #ddd;cursor:help}
+abbr{text-transform:none}
+blockquote{margin:0 0 1.25em;padding:.5625em 1.25em 0 1.1875em;border-left:1px solid #ddd}
+blockquote,blockquote p{line-height:1.6;color:rgba(0,0,0,.85)}
+@media screen and (min-width:768px){h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2}
+h1{font-size:2.75em}
+h2{font-size:2.3125em}
+h3,#toctitle,.sidebarblock>.content>.title{font-size:1.6875em}
+h4{font-size:1.4375em}}
+table{background:#fff;margin-bottom:1.25em;border:solid 1px #dedede;word-wrap:normal}
+table thead,table tfoot{background:#f7f8f7}
+table thead tr th,table thead tr td,table tfoot tr th,table tfoot tr td{padding:.5em .625em .625em;font-size:inherit;color:rgba(0,0,0,.8);text-align:left}
+table tr th,table tr td{padding:.5625em .625em;font-size:inherit;color:rgba(0,0,0,.8)}
+table tr.even,table tr.alt{background:#f8f8f7}
+table thead tr th,table tfoot tr th,table tbody tr td,table tr td,table tfoot tr td{line-height:1.6}
+h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2;word-spacing:-.05em}
+h1 strong,h2 strong,h3 strong,#toctitle strong,.sidebarblock>.content>.title strong,h4 strong,h5 strong,h6 strong{font-weight:400}
+.center{margin-left:auto;margin-right:auto}
+.stretch{width:100%}
+.clearfix::before,.clearfix::after,.float-group::before,.float-group::after{content:" ";display:table}
+.clearfix::after,.float-group::after{clear:both}
+:not(pre).nobreak{word-wrap:normal}
+:not(pre).nowrap{white-space:nowrap}
+:not(pre).pre-wrap{white-space:pre-wrap}
+:not(pre):not([class^=L])>code{font-size:.9375em;font-style:normal!important;letter-spacing:0;padding:.1em .5ex;word-spacing:-.15em;background:#f7f7f8;-webkit-border-radius:4px;border-radius:4px;line-height:1.45;text-rendering:optimizeSpeed}
+pre{color:rgba(0,0,0,.9);font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;line-height:1.45;text-rendering:optimizeSpeed}
+pre code,pre pre{color:inherit;font-size:inherit;line-height:inherit}
+pre>code{display:block}
+pre.nowrap,pre.nowrap pre{white-space:pre;word-wrap:normal}
+em em{font-style:normal}
+strong strong{font-weight:400}
+.keyseq{color:rgba(51,51,51,.8)}
+kbd{font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;display:inline-block;color:rgba(0,0,0,.8);font-size:.65em;line-height:1.45;background:#f7f7f7;border:1px solid #ccc;-webkit-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 0 rgba(0,0,0,.2),0 0 0 .1em white inset;box-shadow:0 1px 0 rgba(0,0,0,.2),0 0 0 .1em #fff inset;margin:0 .15em;padding:.2em .5em;vertical-align:middle;position:relative;top:-.1em;white-space:nowrap}
+.keyseq kbd:first-child{margin-left:0}
+.keyseq kbd:last-child{margin-right:0}
+.menuseq,.menuref{color:#000}
+.menuseq b:not(.caret),.menuref{font-weight:inherit}
+.menuseq{word-spacing:-.02em}
+.menuseq b.caret{font-size:1.25em;line-height:.8}
+.menuseq i.caret{font-weight:bold;text-align:center;width:.45em}
+b.button::before,b.button::after{position:relative;top:-1px;font-weight:400}
+b.button::before{content:"[";padding:0 3px 0 2px}
+b.button::after{content:"]";padding:0 2px 0 3px}
+p a>code:hover{color:rgba(0,0,0,.9)}
+#header,#content,#footnotes,#footer{width:100%;margin-left:auto;margin-right:auto;margin-top:0;margin-bottom:0;max-width:62.5em;*zoom:1;position:relative;padding-left:.9375em;padding-right:.9375em}
+#header::before,#header::after,#content::before,#content::after,#footnotes::before,#footnotes::after,#footer::before,#footer::after{content:" ";display:table}
+#header::after,#content::after,#footnotes::after,#footer::after{clear:both}
+#content{margin-top:1.25em}
+#content::before{content:none}
+#header>h1:first-child{color:rgba(0,0,0,.85);margin-top:2.25rem;margin-bottom:0}
+#header>h1:first-child+#toc{margin-top:8px;border-top:1px solid #dddddf}
+#header>h1:only-child,body.toc2 #header>h1:nth-last-child(2){border-bottom:1px solid #dddddf;padding-bottom:8px}
+#header .details{border-bottom:1px solid #dddddf;line-height:1.45;padding-top:.25em;padding-bottom:.25em;padding-left:.25em;color:rgba(0,0,0,.6);display:-ms-flexbox;display:-webkit-flex;display:flex;-ms-flex-flow:row wrap;-webkit-flex-flow:row wrap;flex-flow:row wrap}
+#header .details span:first-child{margin-left:-.125em}
+#header .details span.email a{color:rgba(0,0,0,.85)}
+#header .details br{display:none}
+#header .details br+span::before{content:"\00a0\2013\00a0"}
+#header .details br+span.author::before{content:"\00a0\22c5\00a0";color:rgba(0,0,0,.85)}
+#header .details br+span#revremark::before{content:"\00a0|\00a0"}
+#header #revnumber{text-transform:capitalize}
+#header #revnumber::after{content:"\00a0"}
+#content>h1:first-child:not([class]){color:rgba(0,0,0,.85);border-bottom:1px solid #dddddf;padding-bottom:8px;margin-top:0;padding-top:1rem;margin-bottom:1.25rem}
+#toc{border-bottom:1px solid #e7e7e9;padding-bottom:.5em}
+#toc>ul{margin-left:.125em}
+#toc ul.sectlevel0>li>a{font-style:italic}
+#toc ul.sectlevel0 ul.sectlevel1{margin:.5em 0}
+#toc ul{font-family:"Open Sans","DejaVu Sans",sans-serif;list-style-type:none}
+#toc li{line-height:1.3334;margin-top:.3334em}
+#toc a{text-decoration:none}
+#toc a:active{text-decoration:underline}
+#toctitle{color:#7a2518;font-size:1.2em}
+@media screen and (min-width:768px){#toctitle{font-size:1.375em}
+body.toc2{padding-left:15em;padding-right:0}
+#toc.toc2{margin-top:0!important;background:#f8f8f7;position:fixed;width:15em;left:0;top:0;border-right:1px solid #e7e7e9;border-top-width:0!important;border-bottom-width:0!important;z-index:1000;padding:1.25em 1em;height:100%;overflow:auto}
+#toc.toc2 #toctitle{margin-top:0;margin-bottom:.8rem;font-size:1.2em}
+#toc.toc2>ul{font-size:.9em;margin-bottom:0}
+#toc.toc2 ul ul{margin-left:0;padding-left:1em}
+#toc.toc2 ul.sectlevel0 ul.sectlevel1{padding-left:0;margin-top:.5em;margin-bottom:.5em}
+body.toc2.toc-right{padding-left:0;padding-right:15em}
+body.toc2.toc-right #toc.toc2{border-right-width:0;border-left:1px solid #e7e7e9;left:auto;right:0}}
+@media screen and (min-width:1280px){body.toc2{padding-left:20em;padding-right:0}
+#toc.toc2{width:20em}
+#toc.toc2 #toctitle{font-size:1.375em}
+#toc.toc2>ul{font-size:.95em}
+#toc.toc2 ul ul{padding-left:1.25em}
+body.toc2.toc-right{padding-left:0;padding-right:20em}}
+#content #toc{border-style:solid;border-width:1px;border-color:#e0e0dc;margin-bottom:1.25em;padding:1.25em;background:#f8f8f7;-webkit-border-radius:4px;border-radius:4px}
+#content #toc>:first-child{margin-top:0}
+#content #toc>:last-child{margin-bottom:0}
+#footer{max-width:none;background:rgba(0,0,0,.8);padding:1.25em}
+#footer-text{color:rgba(255,255,255,.8);line-height:1.44}
+#content{margin-bottom:.625em}
+.sect1{padding-bottom:.625em}
+@media screen and (min-width:768px){#content{margin-bottom:1.25em}
+.sect1{padding-bottom:1.25em}}
+.sect1:last-child{padding-bottom:0}
+.sect1+.sect1{border-top:1px solid #e7e7e9}
+#content h1>a.anchor,h2>a.anchor,h3>a.anchor,#toctitle>a.anchor,.sidebarblock>.content>.title>a.anchor,h4>a.anchor,h5>a.anchor,h6>a.anchor{position:absolute;z-index:1001;width:1.5ex;margin-left:-1.5ex;display:block;text-decoration:none!important;visibility:hidden;text-align:center;font-weight:400}
+#content h1>a.anchor::before,h2>a.anchor::before,h3>a.anchor::before,#toctitle>a.anchor::before,.sidebarblock>.content>.title>a.anchor::before,h4>a.anchor::before,h5>a.anchor::before,h6>a.anchor::before{content:"\00A7";font-size:.85em;display:block;padding-top:.1em}
+#content h1:hover>a.anchor,#content h1>a.anchor:hover,h2:hover>a.anchor,h2>a.anchor:hover,h3:hover>a.anchor,#toctitle:hover>a.anchor,.sidebarblock>.content>.title:hover>a.anchor,h3>a.anchor:hover,#toctitle>a.anchor:hover,.sidebarblock>.content>.title>a.anchor:hover,h4:hover>a.anchor,h4>a.anchor:hover,h5:hover>a.anchor,h5>a.anchor:hover,h6:hover>a.anchor,h6>a.anchor:hover{visibility:visible}
+#content h1>a.link,h2>a.link,h3>a.link,#toctitle>a.link,.sidebarblock>.content>.title>a.link,h4>a.link,h5>a.link,h6>a.link{color:#ba3925;text-decoration:none}
+#content h1>a.link:hover,h2>a.link:hover,h3>a.link:hover,#toctitle>a.link:hover,.sidebarblock>.content>.title>a.link:hover,h4>a.link:hover,h5>a.link:hover,h6>a.link:hover{color:#a53221}
+details,.audioblock,.imageblock,.literalblock,.listingblock,.stemblock,.videoblock{margin-bottom:1.25em}
+details>summary:first-of-type{cursor:pointer;display:list-item;outline:none;margin-bottom:.75em}
+.admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{text-rendering:optimizeLegibility;text-align:left;font-family:"Noto Serif","DejaVu Serif",serif;font-size:1rem;font-style:italic}
+table.tableblock.fit-content>caption.title{white-space:nowrap;width:0}
+.paragraph.lead>p,#preamble>.sectionbody>[class="paragraph"]:first-of-type p{font-size:1.21875em;line-height:1.6;color:rgba(0,0,0,.85)}
+table.tableblock #preamble>.sectionbody>[class="paragraph"]:first-of-type p{font-size:inherit}
+.admonitionblock>table{border-collapse:separate;border:0;background:none;width:100%}
+.admonitionblock>table td.icon{text-align:center;width:80px}
+.admonitionblock>table td.icon img{max-width:none}
+.admonitionblock>table td.icon .title{font-weight:bold;font-family:"Open Sans","DejaVu Sans",sans-serif;text-transform:uppercase}
+.admonitionblock>table td.content{padding-left:1.125em;padding-right:1.25em;border-left:1px solid #dddddf;color:rgba(0,0,0,.6);word-wrap:anywhere}
+.admonitionblock>table td.content>:last-child>:last-child{margin-bottom:0}
+.exampleblock>.content{border-style:solid;border-width:1px;border-color:#e6e6e6;margin-bottom:1.25em;padding:1.25em;background:#fff;-webkit-border-radius:4px;border-radius:4px}
+.exampleblock>.content>:first-child{margin-top:0}
+.exampleblock>.content>:last-child{margin-bottom:0}
+.sidebarblock{border-style:solid;border-width:1px;border-color:#dbdbd6;margin-bottom:1.25em;padding:1.25em;background:#f3f3f2;-webkit-border-radius:4px;border-radius:4px}
+.sidebarblock>:first-child{margin-top:0}
+.sidebarblock>:last-child{margin-bottom:0}
+.sidebarblock>.content>.title{color:#7a2518;margin-top:0;text-align:center}
+.exampleblock>.content>:last-child>:last-child,.exampleblock>.content .olist>ol>li:last-child>:last-child,.exampleblock>.content .ulist>ul>li:last-child>:last-child,.exampleblock>.content .qlist>ol>li:last-child>:last-child,.sidebarblock>.content>:last-child>:last-child,.sidebarblock>.content .olist>ol>li:last-child>:last-child,.sidebarblock>.content .ulist>ul>li:last-child>:last-child,.sidebarblock>.content .qlist>ol>li:last-child>:last-child{margin-bottom:0}
+.literalblock pre,.listingblock>.content>pre{-webkit-border-radius:4px;border-radius:4px;overflow-x:auto;padding:1em;font-size:.8125em}
+@media screen and (min-width:768px){.literalblock pre,.listingblock>.content>pre{font-size:.90625em}}
+@media screen and (min-width:1280px){.literalblock pre,.listingblock>.content>pre{font-size:1em}}
+.literalblock pre,.listingblock>.content>pre:not(.highlight),.listingblock>.content>pre[class="highlight"],.listingblock>.content>pre[class^="highlight "]{background:#f7f7f8}
+.literalblock.output pre{color:#f7f7f8;background:rgba(0,0,0,.9)}
+.listingblock>.content{position:relative}
+.listingblock code[data-lang]::before{display:none;content:attr(data-lang);position:absolute;font-size:.75em;top:.425rem;right:.5rem;line-height:1;text-transform:uppercase;color:inherit;opacity:.5}
+.listingblock:hover code[data-lang]::before{display:block}
+.listingblock.terminal pre .command::before{content:attr(data-prompt);padding-right:.5em;color:inherit;opacity:.5}
+.listingblock.terminal pre .command:not([data-prompt])::before{content:"$"}
+.listingblock pre.highlightjs{padding:0}
+.listingblock pre.highlightjs>code{padding:1em;-webkit-border-radius:4px;border-radius:4px}
+.listingblock pre.prettyprint{border-width:0}
+.prettyprint{background:#f7f7f8}
+pre.prettyprint .linenums{line-height:1.45;margin-left:2em}
+pre.prettyprint li{background:none;list-style-type:inherit;padding-left:0}
+pre.prettyprint li code[data-lang]::before{opacity:1}
+pre.prettyprint li:not(:first-child) code[data-lang]::before{display:none}
+table.linenotable{border-collapse:separate;border:0;margin-bottom:0;background:none}
+table.linenotable td[class]{color:inherit;vertical-align:top;padding:0;line-height:inherit;white-space:normal}
+table.linenotable td.code{padding-left:.75em}
+table.linenotable td.linenos{border-right:1px solid currentColor;opacity:.35;padding-right:.5em}
+pre.pygments .lineno{border-right:1px solid currentColor;opacity:.35;display:inline-block;margin-right:.75em}
+pre.pygments .lineno::before{content:"";margin-right:-.125em}
+.quoteblock{margin:0 1em 1.25em 1.5em;display:table}
+.quoteblock:not(.excerpt)>.title{margin-left:-1.5em;margin-bottom:.75em}
+.quoteblock blockquote,.quoteblock p{color:rgba(0,0,0,.85);font-size:1.15rem;line-height:1.75;word-spacing:.1em;letter-spacing:0;font-style:italic;text-align:justify}
+.quoteblock blockquote{margin:0;padding:0;border:0}
+.quoteblock blockquote::before{content:"\201c";float:left;font-size:2.75em;font-weight:bold;line-height:.6em;margin-left:-.6em;color:#7a2518;text-shadow:0 1px 2px rgba(0,0,0,.1)}
+.quoteblock blockquote>.paragraph:last-child p{margin-bottom:0}
+.quoteblock .attribution{margin-top:.75em;margin-right:.5ex;text-align:right}
+.verseblock{margin:0 1em 1.25em}
+.verseblock pre{font-family:"Open Sans","DejaVu Sans",sans;font-size:1.15rem;color:rgba(0,0,0,.85);font-weight:300;text-rendering:optimizeLegibility}
+.verseblock pre strong{font-weight:400}
+.verseblock .attribution{margin-top:1.25rem;margin-left:.5ex}
+.quoteblock .attribution,.verseblock .attribution{font-size:.9375em;line-height:1.45;font-style:italic}
+.quoteblock .attribution br,.verseblock .attribution br{display:none}
+.quoteblock .attribution cite,.verseblock .attribution cite{display:block;letter-spacing:-.025em;color:rgba(0,0,0,.6)}
+.quoteblock.abstract blockquote::before,.quoteblock.excerpt blockquote::before,.quoteblock .quoteblock blockquote::before{display:none}
+.quoteblock.abstract blockquote,.quoteblock.abstract p,.quoteblock.excerpt blockquote,.quoteblock.excerpt p,.quoteblock .quoteblock blockquote,.quoteblock .quoteblock p{line-height:1.6;word-spacing:0}
+.quoteblock.abstract{margin:0 1em 1.25em;display:block}
+.quoteblock.abstract>.title{margin:0 0 .375em;font-size:1.15em;text-align:center}
+.quoteblock.excerpt>blockquote,.quoteblock .quoteblock{padding:0 0 .25em 1em;border-left:.25em solid #dddddf}
+.quoteblock.excerpt,.quoteblock .quoteblock{margin-left:0}
+.quoteblock.excerpt blockquote,.quoteblock.excerpt p,.quoteblock .quoteblock blockquote,.quoteblock .quoteblock p{color:inherit;font-size:1.0625rem}
+.quoteblock.excerpt .attribution,.quoteblock .quoteblock .attribution{color:inherit;font-size:.85rem;text-align:left;margin-right:0}
+p.tableblock:last-child{margin-bottom:0}
+td.tableblock>.content{margin-bottom:1.25em;word-wrap:anywhere}
+td.tableblock>.content>:last-child{margin-bottom:-1.25em}
+table.tableblock,th.tableblock,td.tableblock{border:0 solid #dedede}
+table.grid-all>*>tr>*{border-width:1px}
+table.grid-cols>*>tr>*{border-width:0 1px}
+table.grid-rows>*>tr>*{border-width:1px 0}
+table.frame-all{border-width:1px}
+table.frame-ends{border-width:1px 0}
+table.frame-sides{border-width:0 1px}
+table.frame-none>colgroup+*>:first-child>*,table.frame-sides>colgroup+*>:first-child>*{border-top-width:0}
+table.frame-none>:last-child>:last-child>*,table.frame-sides>:last-child>:last-child>*{border-bottom-width:0}
+table.frame-none>*>tr>:first-child,table.frame-ends>*>tr>:first-child{border-left-width:0}
+table.frame-none>*>tr>:last-child,table.frame-ends>*>tr>:last-child{border-right-width:0}
+table.stripes-all tr,table.stripes-odd tr:nth-of-type(odd),table.stripes-even tr:nth-of-type(even),table.stripes-hover tr:hover{background:#f8f8f7}
+th.halign-left,td.halign-left{text-align:left}
+th.halign-right,td.halign-right{text-align:right}
+th.halign-center,td.halign-center{text-align:center}
+th.valign-top,td.valign-top{vertical-align:top}
+th.valign-bottom,td.valign-bottom{vertical-align:bottom}
+th.valign-middle,td.valign-middle{vertical-align:middle}
+table thead th,table tfoot th{font-weight:bold}
+tbody tr th{background:#f7f8f7}
+tbody tr th,tbody tr th p,tfoot tr th,tfoot tr th p{color:rgba(0,0,0,.8);font-weight:bold}
+p.tableblock>code:only-child{background:none;padding:0}
+p.tableblock{font-size:1em}
+ol{margin-left:1.75em}
+ul li ol{margin-left:1.5em}
+dl dd{margin-left:1.125em}
+dl dd:last-child,dl dd:last-child>:last-child{margin-bottom:0}
+ol>li p,ul>li p,ul dd,ol dd,.olist .olist,.ulist .ulist,.ulist .olist,.olist .ulist{margin-bottom:.625em}
+ul.checklist,ul.none,ol.none,ul.no-bullet,ol.no-bullet,ol.unnumbered,ul.unstyled,ol.unstyled{list-style-type:none}
+ul.no-bullet,ol.no-bullet,ol.unnumbered{margin-left:.625em}
+ul.unstyled,ol.unstyled{margin-left:0}
+ul.checklist{margin-left:.625em}
+ul.checklist li>p:first-child>.fa-square-o:first-child,ul.checklist li>p:first-child>.fa-check-square-o:first-child{width:1.25em;font-size:.8em;position:relative;bottom:.125em}
+ul.checklist li>p:first-child>input[type="checkbox"]:first-child{margin-right:.25em}
+ul.inline{display:-ms-flexbox;display:-webkit-box;display:flex;-ms-flex-flow:row wrap;-webkit-flex-flow:row wrap;flex-flow:row wrap;list-style:none;margin:0 0 .625em -1.25em}
+ul.inline>li{margin-left:1.25em}
+.unstyled dl dt{font-weight:400;font-style:normal}
+ol.arabic{list-style-type:decimal}
+ol.decimal{list-style-type:decimal-leading-zero}
+ol.loweralpha{list-style-type:lower-alpha}
+ol.upperalpha{list-style-type:upper-alpha}
+ol.lowerroman{list-style-type:lower-roman}
+ol.upperroman{list-style-type:upper-roman}
+ol.lowergreek{list-style-type:lower-greek}
+.hdlist>table,.colist>table{border:0;background:none}
+.hdlist>table>tbody>tr,.colist>table>tbody>tr{background:none}
+td.hdlist1,td.hdlist2{vertical-align:top;padding:0 .625em}
+td.hdlist1{font-weight:bold;padding-bottom:1.25em}
+td.hdlist2{word-wrap:anywhere}
+.literalblock+.colist,.listingblock+.colist{margin-top:-.5em}
+.colist td:not([class]):first-child{padding:.4em .75em 0;line-height:1;vertical-align:top}
+.colist td:not([class]):first-child img{max-width:none}
+.colist td:not([class]):last-child{padding:.25em 0}
+.thumb,.th{line-height:0;display:inline-block;border:solid 4px #fff;-webkit-box-shadow:0 0 0 1px #ddd;box-shadow:0 0 0 1px #ddd}
+.imageblock.left{margin:.25em .625em 1.25em 0}
+.imageblock.right{margin:.25em 0 1.25em .625em}
+.imageblock>.title{margin-bottom:0}
+.imageblock.thumb,.imageblock.th{border-width:6px}
+.imageblock.thumb>.title,.imageblock.th>.title{padding:0 .125em}
+.image.left,.image.right{margin-top:.25em;margin-bottom:.25em;display:inline-block;line-height:0}
+.image.left{margin-right:.625em}
+.image.right{margin-left:.625em}
+a.image{text-decoration:none;display:inline-block}
+a.image object{pointer-events:none}
+sup.footnote,sup.footnoteref{font-size:.875em;position:static;vertical-align:super}
+sup.footnote a,sup.footnoteref a{text-decoration:none}
+sup.footnote a:active,sup.footnoteref a:active{text-decoration:underline}
+#footnotes{padding-top:.75em;padding-bottom:.75em;margin-bottom:.625em}
+#footnotes hr{width:20%;min-width:6.25em;margin:-.25em 0 .75em;border-width:1px 0 0}
+#footnotes .footnote{padding:0 .375em 0 .225em;line-height:1.3334;font-size:.875em;margin-left:1.2em;margin-bottom:.2em}
+#footnotes .footnote a:first-of-type{font-weight:bold;text-decoration:none;margin-left:-1.05em}
+#footnotes .footnote:last-of-type{margin-bottom:0}
+#content #footnotes{margin-top:-.625em;margin-bottom:0;padding:.75em 0}
+.gist .file-data>table{border:0;background:#fff;width:100%;margin-bottom:0}
+.gist .file-data>table td.line-data{width:99%}
+div.unbreakable{page-break-inside:avoid}
+.big{font-size:larger}
+.small{font-size:smaller}
+.underline{text-decoration:underline}
+.overline{text-decoration:overline}
+.line-through{text-decoration:line-through}
+.aqua{color:#00bfbf}
+.aqua-background{background:#00fafa}
+.black{color:#000}
+.black-background{background:#000}
+.blue{color:#0000bf}
+.blue-background{background:#0000fa}
+.fuchsia{color:#bf00bf}
+.fuchsia-background{background:#fa00fa}
+.gray{color:#606060}
+.gray-background{background:#7d7d7d}
+.green{color:#006000}
+.green-background{background:#007d00}
+.lime{color:#00bf00}
+.lime-background{background:#00fa00}
+.maroon{color:#600000}
+.maroon-background{background:#7d0000}
+.navy{color:#000060}
+.navy-background{background:#00007d}
+.olive{color:#606000}
+.olive-background{background:#7d7d00}
+.purple{color:#600060}
+.purple-background{background:#7d007d}
+.red{color:#bf0000}
+.red-background{background:#fa0000}
+.silver{color:#909090}
+.silver-background{background:#bcbcbc}
+.teal{color:#006060}
+.teal-background{background:#007d7d}
+.white{color:#bfbfbf}
+.white-background{background:#fafafa}
+.yellow{color:#bfbf00}
+.yellow-background{background:#fafa00}
+span.icon>.fa{cursor:default}
+a span.icon>.fa{cursor:inherit}
+.admonitionblock td.icon [class^="fa icon-"]{font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
+.admonitionblock td.icon .icon-note::before{content:"\f05a";color:#19407c}
+.admonitionblock td.icon .icon-tip::before{content:"\f0eb";text-shadow:1px 1px 2px rgba(155,155,0,.8);color:#111}
+.admonitionblock td.icon .icon-warning::before{content:"\f071";color:#bf6900}
+.admonitionblock td.icon .icon-caution::before{content:"\f06d";color:#bf3400}
+.admonitionblock td.icon .icon-important::before{content:"\f06a";color:#bf0000}
+.conum[data-value]{display:inline-block;color:#fff!important;background:rgba(0,0,0,.8);-webkit-border-radius:50%;border-radius:50%;text-align:center;font-size:.75em;width:1.67em;height:1.67em;line-height:1.67em;font-family:"Open Sans","DejaVu Sans",sans-serif;font-style:normal;font-weight:bold}
+.conum[data-value] *{color:#fff!important}
+.conum[data-value]+b{display:none}
+.conum[data-value]::after{content:attr(data-value)}
+pre .conum[data-value]{position:relative;top:-.125em}
+b.conum *{color:inherit!important}
+.conum:not([data-value]):empty{display:none}
+dt,th.tableblock,td.content,div.footnote{text-rendering:optimizeLegibility}
+h1,h2,p,td.content,span.alt{letter-spacing:-.01em}
+p strong,td.content strong,div.footnote strong{letter-spacing:-.005em}
+p,blockquote,dt,td.content,span.alt{font-size:1.0625rem}
+p{margin-bottom:1.25rem}
+.sidebarblock p,.sidebarblock dt,.sidebarblock td.content,p.tableblock{font-size:1em}
+.exampleblock>.content{background:#fffef7;border-color:#e0e0dc;-webkit-box-shadow:0 1px 4px #e0e0dc;box-shadow:0 1px 4px #e0e0dc}
+.print-only{display:none!important}
+@page{margin:1.25cm .75cm}
+@media print{*{-webkit-box-shadow:none!important;box-shadow:none!important;text-shadow:none!important}
+html{font-size:80%}
+a{color:inherit!important;text-decoration:underline!important}
+a.bare,a[href^="#"],a[href^="mailto:"]{text-decoration:none!important}
+a[href^="http:"]:not(.bare)::after,a[href^="https:"]:not(.bare)::after{content:"(" attr(href) ")";display:inline-block;font-size:.875em;padding-left:.25em}
+abbr[title]::after{content:" (" attr(title) ")"}
+pre,blockquote,tr,img,object,svg{page-break-inside:avoid}
+thead{display:table-header-group}
+svg{max-width:100%}
+p,blockquote,dt,td.content{font-size:1em;orphans:3;widows:3}
+h2,h3,#toctitle,.sidebarblock>.content>.title{page-break-after:avoid}
+#header,#content,#footnotes,#footer{max-width:none}
+#toc,.sidebarblock,.exampleblock>.content{background:none!important}
+#toc{border-bottom:1px solid #dddddf!important;padding-bottom:0!important}
+body.book #header{text-align:center}
+body.book #header>h1:first-child{border:0!important;margin:2.5em 0 1em}
+body.book #header .details{border:0!important;display:block;padding:0!important}
+body.book #header .details span:first-child{margin-left:0!important}
+body.book #header .details br{display:block}
+body.book #header .details br+span::before{content:none!important}
+body.book #toc{border:0!important;text-align:left!important;padding:0!important;margin:0!important}
+body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-break-before:always}
+.listingblock code[data-lang]::before{display:block}
+#footer{padding:0 .9375em}
+.hide-on-print{display:none!important}
+.print-only{display:block!important}
+.hide-for-print{display:none!important}
+.show-for-print{display:inherit!important}}
+@media print,amzn-kf8{#header>h1:first-child{margin-top:1.25rem}
+.sect1{padding:0!important}
+.sect1+.sect1{border:0}
+#footer{background:none}
+#footer-text{color:rgba(0,0,0,.6);font-size:.9em}}
+@media amzn-kf8{#header,#content,#footnotes,#footer{padding:0}}
+</style>
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+</head>
+<body class="article toc2 toc-left">
+<div id="header">
+<div id="toc" class="toc2">
+<div id="toctitle">Index</div>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="../language/language.html">Language</a><ul class="sectlevel4"><li><a style="" href="../language/types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="../language/states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="../language/components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
+</div>
+</div>
+<div id="content">
+<div class="sect1">
+<h2 id="_tutorial"><a class="anchor" href="#_tutorial"></a>Tutorial</h2>
+<div class="sectionbody">
+<div class="sect2 normal">
+<h3 id="_introduction"><a class="anchor" href="#_introduction"></a>Introduction</h3>
+<div class="paragraph">
+<p>The goal of this tutorial is to get experience with interface modeling in CommaSuite and
+the use of the generator facilities of the CommaSuite tooling.
+First in Section 1.1 a short overview of the CommaSuite approach is given.
+As a case study we use a small vending machine example as described in Section 1.2.
+Resources for support are listed in Section 1.3.
+The structure of the remainder of this tutorial is described in Section 1.4.</p>
+</div>
+<div class="paragraph">
+<p>This tutorial assumes that the tool installation has been completed
+and requires a zip file <em>VendingMachine.zip</em>
+which contains a project which is the starting point for the exercises.</p>
+</div>
+<div class="sect3">
+<h4 id="_overview"><a class="anchor" href="#_overview"></a>Overview</h4>
+<div class="paragraph">
+<p>The lack of precise and explicit specifications of component interfaces often
+leads to problems during the integration of components.
+Also updates of components might lead to system issues,
+e.g., caused by changes in the interaction protocol or timing behavior.
+At system level, it is usually difficult to detect the source of such issues.
+The challenge is to develop a set of tools which allows the precise definition and
+analysis of client-server interfaces.</p>
+</div>
+<div class="paragraph">
+<p>The CommaSuite (Component Modeling and Analysis) approach is based on a
+hierarchy of Domain Specific Languages (DSLs).
+Interface specifications in CommaSuite consist of three main ingredients,
+as illustrated in <a href="#img_client-server">[img_client-server]</a>:</p>
+</div>
+<div id="img_client-server" class="paragraph">
+<p><span class="image"><img src="../img/image1.png" alt="image" width="248" height="146" title="Client-server interface"></span></p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>The interface signature, i.e., the set of commands, signals and notifications
+that a server offers to its clients.</p>
+<div class="ulist">
+<ul>
+<li>
+<p>Commands: synchronous function calls from client to server;
+the server sends a reply to the client</p>
+</li>
+<li>
+<p>Signals: asynchronous function calls from client to server;
+the server does not send a reply</p>
+</li>
+<li>
+<p>Notifications: asynchronous messages from server to client;
+the client does not send a reply</p>
+</li>
+</ul>
+</div>
+</li>
+<li>
+<p>State machine(s) that describe the interaction protocol between
+client and server, i.e., the allowed sequence of commands, signals and
+notifications.</p>
+</li>
+<li>
+<p>Data and timing constraints on the client-server interaction,
+such as lower and upper bounds on response times, periodicity requirements,
+and constraints on parameters of subsequent events.</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>For an interface, the tooling generates a large number of artefacts such as:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>UML diagrams of the state machine(s) and constraints.
+Also a document according to a company template can be generated.</p>
+</li>
+<li>
+<p>A framework to monitor whether implementations of client and
+server conform to the specified interface.</p>
+</li>
+<li>
+<p>Stubs and simulation possibilities.</p>
+</li>
+<li>
+<p>Scenarios for test case generation.</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>An important analysis tool is the monitoring framework, which allows frequent
+checks on interface conformance.
+For instance, during nightly tests and after components updates.
+Monitoring is based on a trace of client-server interactions, e.g.,
+obtained via logging or sniffing.
+When a trace does not conform to the state machine behavior,
+the monitoring tool generates an error and stops monitoring.
+When a data or time constraint is violated, a warning is generated and
+monitoring continues.
+Monitoring also provides statistics about the specified time constraints,
+e.g., a histogram of the observed response times.
+In this tutorial, monitoring will be triggered manually,
+but there command-line tooling is available such that it can be invoked
+automatically during the test process.</p>
+</div>
+<div class="paragraph">
+<p>An overview of the approach is shown in <a href="#img_overview">[img_overview]</a>.</p>
+</div>
+<div id="img_overview" class="paragraph">
+<p><span class="image"><img src="../img/image2.png" alt="image" width="601" height="309" title="Overview of the CommaSuite approach"></span></p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_case_study"><a class="anchor" href="#_case_study"></a>Case study</h4>
+<div class="paragraph">
+<p>As a case study, we consider a simple <em>vending machine</em> implemented in Java.
+There is a GUI that can be used to interact with the vending machine.
+During the workshop, the interface <em>behavior</em> of the vending machine component
+will be specified using CommaSuite.
+The interaction between the GUI and the vending machine will be
+recorded in a trace file and using CommaSuite it can be checked
+if it conforms to the specified behavior.
+In addition, the tutorial addresses the generation of other artefacts such
+as UML diagrams and documentation.</p>
+</div>
+<div class="paragraph">
+<p>The vending machine is a component with three interfaces,
+as shown in <a href="#img_interfaces_vm">[img_interfaces_vm]</a>.</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>A provided interface for users to insert money, order products and get money back.</p>
+</li>
+<li>
+<p>A provided service interface to switch the machine on and off, and to load products.</p>
+</li>
+<li>
+<p>A required interface to check coins.
+The coin check component which provides this interface may raise an error,
+called CoinCheckerProblem, and it can be reset.</p>
+</li>
+</ul>
+</div>
+<div id="img_interfaces_vm" class="paragraph">
+<p><span class="image"><img src="../img/image3.png" alt="image3" height="146" title="Interfaces of the Vending Machine component"></span></p>
+</div>
+<div class="paragraph">
+<p><em>Note:
+this manual is suitable for the Standard version and the Philips version of CommaSuite.
+In <a href="#_model_and_check_the_interfaces_of_the_vending_machine">Model and check the interfaces of the vending machine</a>,
+Activity 6 is different for the two versions and
+Activity 7 is only for the Philips version.</em></p>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_resources_for_additional_support"><a class="anchor" href="#_resources_for_additional_support"></a>Resources for additional support</h4>
+<div class="paragraph">
+<p>There are several resources for additional support:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Shortcuts in the user guide provides an overview of Eclipse commands and shortcuts.
+Most import is <strong><em>&lt;CTRL&gt;-&lt;SPACE&gt;</em></strong> for content assist.
+Also <strong><em>&lt;CTRL&gt;-&lt;SHIFT&gt;-F</em></strong> for automatic formatting might be useful.</p>
+</li>
+<li>
+<p>Together with the tutorial, a cheat sheet is distributed which provides an
+example of the grammar for state machines.</p>
+</li>
+<li>
+<p>The CommaSuite help in Eclipse: go to menu Help &gt; Help Contents,
+section CommaSuite User Guide or use F1.</p>
+</li>
+<li>
+<p>Available example(s): File &gt; New &gt; Example ; see CommaSuite Examples.</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p><strong>Problem solving:</strong></p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Sometimes the Console view might become black as shown in <a href="#img_black-console">[img_black-console]</a>.
+Then right-click in the window, select Preferences.
+In Console view click on Background color,
+select white from Basic colors, OK, Apply and Close.</p>
+</li>
+</ul>
+</div>
+<div id="img_black-console" class="paragraph">
+<p><span class="image"><img src="../img/image4.png" alt="image" width="300" height="100" title="Black console view"></span></p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>In case of problems, e.g. because of caching, Project &gt; Clean might help.
+Otherwise try a complete restart of Eclipse.</p>
+</li>
+<li>
+<p>Note: the Tasks view can be minimized.</p>
+</li>
+</ul>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_preparation_for_the_vending_machine_interfaces"><a class="anchor" href="#_preparation_for_the_vending_machine_interfaces"></a>Preparation for the vending machine interfaces</h3>
+<div class="paragraph">
+<p>This section contains a number of activities to prepare the definition of
+state machines for the interfaces in Section 3.</p>
+</div>
+<div class="paragraph">
+<p>Create a folder <em>"ComMAWorkshop"</em> at a high level in your folder structure&#8201;&#8212;&#8201;a deeply nested folder leads
+to avoid long path names which might create problems.
+Start Eclipse with the created folder <em>ComMAWorkshop</em> as workspace.
+Import the vending machine project as follows:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Go to menu File/Import&#8230;&#8203;, open folder General and
+select "Existing Projects into Workspace".
+Hit the Next button.</p>
+</li>
+<li>
+<p>Select the "Select archive file" option and browse to select
+the <em>VendingMachine.zip</em> file.
+The project should be selected (otherwise select it manually) and click Finish</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>The imported project contains:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>A <em>src</em> folder with the Java implementation and a GUI of the vending machine.</p>
+</li>
+<li>
+<p>File <em>VendingMachine.types</em> which defines a number of types,
+in addition to the predefined types such as bool, int, real, and string.</p>
+</li>
+<li>
+<p>Folder <em>IService</em> which contains:</p>
+<div class="ulist">
+<ul>
+<li>
+<p>File <em>IService.signature</em> which defines the signature of the IService interface.
+Note that the files imports the .types file.
+In general, the names of imported .types files must be different from the signature
+file name (to avoid potential name clashes in generated code).
+The doxygen-style tags in the comments will be used for document generation,
+as explained later.</p>
+</li>
+<li>
+<p>File <em>IService.interface</em> with a dummy state machine.
+Note that there are warnings about unused messages from the signature.
+By means of the activities below, the state machine will gradually be completed
+for these messages.
+In general, a state machine describes the interface protocol from the viewpoint of
+server, i.e. which commands and signals can it receive in any state and
+which notifications it is allowed to send.
+Messages that are not specified are not allowed.</p>
+</li>
+</ul>
+</div>
+</li>
+<li>
+<p>File <em>VendingMachine.prj</em> in which generator tasks will be specified.
+Files with this extension should always be placed in the main project folder.</p>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_model_and_check_the_interfaces_of_the_vending_machine"><a class="anchor" href="#_model_and_check_the_interfaces_of_the_vending_machine"></a>Model and check the interfaces of the vending machine</h3>
+<div class="paragraph">
+<p>The section contains activities to specify the three interfaces of the vending machine
+such that they conform to the implementation.
+Conformance is checked by the generated monitoring.
+Moreover a few other artifacts are generated.</p>
+</div>
+<div class="sect3">
+<h4 id="_specify_the_service_interface"><a class="anchor" href="#_specify_the_service_interface"></a>Specify the service interface</h4>
+<div class="paragraph">
+<p>The behavioral specification in the file <em>IService.interface</em> is extended by a
+number of activities.</p>
+</div>
+<div class="sect4">
+<h5 id="_activity_1_get_familiar_with_the_vending_machine"><a class="anchor" href="#_activity_1_get_familiar_with_the_vending_machine"></a>Activity 1: Get familiar with the Vending Machine</h5>
+<div class="ulist">
+<ul>
+<li>
+<p>Navigate to folder <em>src/vendingMachine.</em> It contains file <em>TestUI.java</em>.
+Run this file as a Java application (right click and then <em>Run as/Java Application</em>).</p>
+</li>
+<li>
+<p>This leads to a GUI where buttons are commands that the machine can execute.
+Some commands require the selection of the result, indicated in red.</p>
+</li>
+<li>
+<p>Use the <em>Start</em> button and experiment with the machine, with a focus on
+the service interface.</p>
+</li>
+<li>
+<p>After pushing the <em>Save</em> button, the sequence of the executed commands and
+the responses is stored as an execution trace in the file <em>VendingMachine.events</em>.
+This file will be used later to check if the trace conforms to a behavioral specification.
+If the file <em>VendingMachine.events</em> is not visible in the project,
+right-click on the project and choose "Refresh" or F5.</p>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect4">
+<h5 id="_activity_2_make_an_initial_specification_of_the_service_interface"><a class="anchor" href="#_activity_2_make_an_initial_specification_of_the_service_interface"></a>Activity 2: Make an initial specification of the service interface</h5>
+<div class="paragraph">
+<p>The goal of this activity is to create an initial version of
+a state machine model for the service interface.
+Open file <em>IService.interface</em> and modify the dummy state machine such that
+it matches the following description:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Initially the vending machine only accepts the <em>SwitchOn</em> command,
+which leads to result OK and the machine becomes operational.</p>
+</li>
+<li>
+<p>When the machine is operational, it accepts command <em>LoadProduct</em>.
+Moreover it can be switched off by the <em>SwitchOff</em> signal.</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>Hints:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Ctrl-space provides templates for various types of transitions.</p>
+</li>
+<li>
+<p>Use <span class="purple"><strong>reply</strong></span> for a void command such as <em>LoadProduct</em>.</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>When ready with the state machine,
+extend the project file with a generator for UML diagrams as follows.
+Open file <em>VendingMachine.prj</em>,
+place the cursor between the two brackets and
+use Ctrl-space to inspect the possible generators;
+select "Generate UML Block" by double clicking.</p>
+</div>
+<div class="paragraph">
+<p>Next right-click on file <em>VendingMachine.prj</em>
+(or somewhere in the editor of the file) and choose
+"Execute CommaSuite Workflow".</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>In the lower right corner there is an indication in green while the workflow is
+being executed.</p>
+</li>
+<li>
+<p>When finished, the result can be inspected in folder <em>src-gen/uml</em>.</p>
+</li>
+<li>
+<p>Since the project file contains a task to generate UML, the CommaSuite tool
+generates UML state machine diagrams in the form of</p>
+<div class="ulist">
+<ul>
+<li>
+<p><em>.png</em> files; note that there are reduced version of the state machine
+which is convenient for large state machines</p>
+</li>
+<li>
+<p><em>.plantUML</em> files; to show the diagram,</p>
+<div class="ulist">
+<ul>
+<li>
+<p>open the file (in case a pop-up occurs, select "Associate '*.plantuml' files
+with the current editor &#8230;&#8203; ")</p>
+</li>
+<li>
+<p>open the PlantUML view; go to menu Window/Show View/Other&#8230;&#8203; ,
+expand the <em>PlantUML</em> folder and choose <em>PlantUML</em>.<br>
+PlantUML files are displayed using Graphviz. If this does not work correctly,
+first restart Eclipse and try again; if this is not sufficient,
+add the path to the <em>bin</em> folder of Graphviz to the <em>path</em> environment variable.</p>
+</li>
+</ul>
+</div>
+</li>
+<li>
+<p><em>.graphml</em>; these files can be edited with, for instance, yEd.
+This is outside the scope of this tutorial; guidelines can be found on <a href="http://comma.esi.nl/" class="bare">http://comma.esi.nl/</a>.</p>
+</li>
+</ul>
+</div>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect4">
+<h5 id="_activity_3_check_an_execution_trace_against_the_state_machine"><a class="anchor" href="#_activity_3_check_an_execution_trace_against_the_state_machine"></a>Activity 3: Check an Execution Trace against the State Machine</h5>
+<div class="paragraph">
+<p>Once the initial state machine model is defined,
+an execution trace like <em>VendingMachine.events</em> can be checked for
+conformance against this model.
+First create in the main project directory
+a folder <em>VendingMachineEventsFiles</em>.
+Next extend <em>VendingMachine.prj</em> with a task
+to generate the monitoring (you may copy the text below):</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code>Generate Monitors {
+   monitoringIService for interface IService {
+     trace directories "VendingMachineEventsFiles"
+   }
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>The lay-out can be improved by means of <em>&lt;CTRL&gt;-&lt;SHIFT&gt;-F</em>.
+Next perform the following steps:</p>
+</div>
+<div class="olist arabic">
+<ol class="arabic">
+<li>
+<p>Execute again the steps from Activity 1 by just switching on and off
+the machine a couple of times and performing <em>LoadProducts</em>.
+Do not perform any other actions!
+These actions are recorded in file <em>VendingMachine.events</em>.</p>
+</li>
+<li>
+<p>Rename <em>VendingMachine.events</em> to <em>VendingMachine1.events</em>
+(use right-click on the files &gt; Refactor) and
+move it to folder <em>VendingMachineEventsFiles</em>.</p>
+</li>
+<li>
+<p>Construct a few more .event files, including a few that
+do not conform to the specification, and move them also
+to folder <em>VendingMachineEventsFiles</em> after renaming.</p>
+</li>
+<li>
+<p>Right-click on file <em>VendingMachine.prj</em> and
+choose "Run As &gt; CommaSuite Generation and Monitoring"<em>.</em>
+The check is executed and results are produced.</p>
+<div class="ulist">
+<ul>
+<li>
+<p>In order to view the results of monitoring,
+see folder <em>comma-gen/monitoringIService.</em>
+If there are no errors, coverage info can be found in file <em>CoverageInfo.txt</em>.
+In each state the transitions are numbered in the order of
+occurrence and the file describes for each transition
+how often it was used during monitoring.
+If a transition contains multiple clauses (by mean of the "OR" construct)
+then also the clauses are numbered.
+The file also report the percentage of covered transitions and states.</p>
+</li>
+<li>
+<p>In case of errors, an overview is giving in file <em>ErrorSummary.txt</em>
+with an indication where to find the errors.</p>
+</li>
+<li>
+<p>Folder <em>Statistics</em> is related to time constraints and
+will be explained later.</p>
+</li>
+</ul>
+</div>
+</li>
+<li>
+<p>In case of errors, a sequence diagram of the error trace is
+written in a file with extension <em>.plantuml</em>.
+Show the content using the PlantUML view as described in Activity 2.</p>
+</li>
+</ol>
+</div>
+</div>
+<div class="sect4">
+<h5 id="_activity_4_extend_specification_of_service_interface"><a class="anchor" href="#_activity_4_extend_specification_of_service_interface"></a>Activity 4: Extend specification of service interface</h5>
+<div class="olist arabic">
+<ol class="arabic">
+<li>
+<p>Extend the specification in <em>IService.interface</em> with the remaining part
+of the signature according to the following informal description:</p>
+<div class="ulist">
+<ul>
+<li>
+<p>At any point in time, the vending machine may send an <em>OutOfOrder</em> notification
+(indicating some internal problem), going into error mode.
+Note that such an autonomous action of the server can be modelled as
+a transition without trigger and a notification in the "do"-part.</p>
+</li>
+<li>
+<p>In error mode, the <em>SwitchOn</em> command fails and the commands to switch
+off and load product have no effect.</p>
+</li>
+<li>
+<p>In error mode, the <em>Reset</em> command may bring the vending machine
+to the initial state where it is off.
+There is also a possibility that the <em>Reset</em> command fails.
+The <em>Reset</em> command is not allowed outside error mode.</p>
+</li>
+</ul>
+</div>
+</li>
+</ol>
+</div>
+<div class="olist arabic">
+<ol class="arabic" start="2">
+<li>
+<p>Use monitoring to check the correctness of the IService specification
+with respect to the implementation:</p>
+<div class="ulist">
+<ul>
+<li>
+<p>To generate an <em>OutOfOrder</em> notification, click the <em>CoinChecker</em> Problem
+button of the coin checker interface.</p>
+</li>
+<li>
+<p>After a <em>Reset</em>, select the result.</p>
+</li>
+</ul>
+</div>
+</li>
+</ol>
+</div>
+</div>
+<div class="sect4">
+<h5 id="_activity_5_add_a_time_constraint"><a class="anchor" href="#_activity_5_add_a_time_constraint"></a>Activity 5: Add a time constraint</h5>
+<div class="paragraph">
+<p>Interface specifications can be extended with constraints on time and data.</p>
+</div>
+<div class="olist arabic">
+<ol class="arabic">
+<li>
+<p>As example, after the state machine in <em>IService.interface</em>,
+add the following time constraint with name <em>loadProduct_reply</em> :</p>
+</li>
+</ol>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre>timing constraints
+loadProduct_reply
+command LoadProduct - [ 1000.0 ms .. 1100.0 ms ] -&gt; reply to command LoadProduct</pre>
+</div>
+</div>
+<div class="paragraph">
+<p>It specifies that after a command <em>LoadProduct</em>,
+the reply to this command should occur in the interval [1000, 1100],
+so after 1000 ms and before 1100 ms have elapsed.
+Note that a real is denoted in CommaSuite with a dot, e.g. 7.0, or
+exponential notation, e.g. 3.4e-5.</p>
+</div>
+<div class="olist arabic">
+<ol class="arabic" start="2">
+<li>
+<p>Use the GUI to create a .event file where the command <em>LoadProduct</em>
+is called a number of times,
+e.g. interleaved with other events.</p>
+</li>
+<li>
+<p>Run the monitoring and inspect the results; note that violations
+to time constraints lead to warnings.</p>
+</li>
+<li>
+<p>When a trace is checked against time constraints, statistical information is collected.
+The information is located in folder <em>comma-gen/&lt;taskname&gt;/statistics</em> in a file
+with extension .statistics.
+You can view different charts generated from files with prefix <em>statisticsTime</em>
+by right-clicking on it
+and choosing menu <em>Show Statistics Charts</em>.
+You can find more information about statistics in CommaSuite Help,
+section <em>Generation of Statistics.</em></p>
+</li>
+</ol>
+</div>
+</div>
+<div class="sect4">
+<h5 id="_activity_6_documentation_generation_for_the_philips_version"><a class="anchor" href="#_activity_6_documentation_generation_for_the_philips_version"></a>Activity 6: Documentation Generation <em>for the Philips version</em></h5>
+<div class="paragraph">
+<p>To obtain documentation for the Philips version of the tooling, first obtain the template as follows.</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Right-click on <em>VendingMachine.prj</em> and select "Import Philips Template";
+this adds a file <em>Template.docx</em>.</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>Next extend <em>VendingMachine.prj</em> with the following task for document generation:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code>Generate Documentations {
+  documentationTask for interface IService {
+     template = "Template.docx"
+     DHF = 123456
+     author = "John Smith"
+-    role = "R&amp;D: SW Designer"
+  }
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Execute the CommaSuite workflow and next navigate to folder <em>src-gen/doc/</em> and
+open the generated <em>.docx</em> file.
+It contains information from the comments in the <em>.signature</em> and <em>.interface</em> files.
+In addition, the simple state machine is presented in a table form.</p>
+</div>
+</div>
+<div class="sect4">
+<h5 id="_activity_6_documentation_generation_for_the_standard_version"><a class="anchor" href="#_activity_6_documentation_generation_for_the_standard_version"></a>Activity 6: Documentation Generation <em>for the Standard version</em></h5>
+<div class="paragraph">
+<p>To obtain documentation for the standard version of the tool, first obtain the template as follows.</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Right-click on <em>VendingMachine.prj</em> and select "Import Documentation Template";
+this adds a file <em>Template.docx</em>. (Use Refresh / F5 on the project if the file is not visible.)</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>Next extend <em>VendingMachine.prj</em> with the following task for document generation:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code>Generate Documentations {
+    documentationTask for interface IService {
+        template = "Template.docx"
+        targetFile = "Documentation.docx"
+        author = "John Smith"
+        role = "R&amp;D: SW Designer"
+    }
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Execute the CommaSuite workflow and next navigate to folder <em>src-gen/doc/</em> and
+open the generated <em>.docx</em> file.
+It contains information from the comments in the <em>.signature</em> and <em>.interface</em> files.
+In addition, the simple state machine is presented in a table form.</p>
+</div>
+</div>
+<div class="sect4">
+<h5 id="_activity_7_sscf_generation_only_for_the_philips_version"><a class="anchor" href="#_activity_7_sscf_generation_only_for_the_philips_version"></a>Activity 7: SSCF Generation <em>only for the Philips version</em></h5>
+<div class="paragraph">
+<p>Extend <em>VendingMachine.prj</em> with the following task for SSCF generation:</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code>Generate CPP {
+   cppTask for interface IService
+}</code></pre>
+</div>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Execute the CommaSuite workflow and navigate to folder <em>src-gen/cpp11</em>.
+It contains the generated C proxy code following the SSCF conventions.
+Code for C 98 is generated in folder <em>src-gen/cpp98</em>.</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>Also CLI code can be generated. When the specification includes user defined primitive types
+that are not based on a CommaSuite primitive type, or when CommaSuite primitive types
+such as <em>real</em>, <em>string</em> or <em>integer</em> need to be mapped to custom implementation types,
+then a type mapping task is needed. See the CommaSuite help for more information.</p>
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_specify_the_coin_checker_interface"><a class="anchor" href="#_specify_the_coin_checker_interface"></a>Specify the coin checker interface</h4>
+<div class="paragraph">
+<p>In this section the required ICoinCheck interface is specified.
+To avoid long execution times, the <em>VendingMachine.prj</em> file might be simplified
+such that it only contains the monitoring task for the IService interface.</p>
+</div>
+<div class="paragraph">
+<p>Folder ICoinCheck already contains the following files:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><em>ICoinCheck.signature</em> with the signature of the coin checker.</p>
+</li>
+<li>
+<p><em>ICoinCheck.interface</em> with a dummy state machine that will
+be extended in the following activities.</p>
+</li>
+</ul>
+</div>
+<div class="sect4">
+<h5 id="_activity_8_state_machine_coin_checker"><a class="anchor" href="#_activity_8_state_machine_coin_checker"></a>Activity 8: State machine coin checker</h5>
+<div class="paragraph">
+<p>Adapt the state machine based on the following information:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>In the initial state only command <em>CheckCoin</em> can be accepted,
+which results in a reply indicating that the coin is accepted or not accepted.</p>
+</li>
+<li>
+<p>At any moment, the coin checker may generate a <em>CoinCheckerProblem</em> notification
+after which the coin checker is in error mode.</p>
+</li>
+<li>
+<p>The <em>ResetCoinChecker</em> command is only allowed in the error mode;
+it may be successful, leading to the initial state or fail
+(then the coin checker stays in error mode).</p>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect4">
+<h5 id="_activity_9_check_the_specified_interfaces_by_monitoring"><a class="anchor" href="#_activity_9_check_the_specified_interfaces_by_monitoring"></a>Activity 9: Check the specified interfaces by monitoring</h5>
+<div class="ulist">
+<ul>
+<li>
+<p>Extend the project file <em>VendingMachine.prj</em> with an import of <em>ICoinCheck.interface.</em></p>
+</li>
+<li>
+<p>Add a monitoring task as follows:</p>
+</li>
+</ul>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code>Generate Monitors {
+   monitoringIService for interface IService {
+      trace directories "VendingMachineEventsFiles"
+   }
+   monitoringICoinCheck for interface ICoinCheck {
+      trace directories "VendingMachineEventsFiles"
+   }
+}</code></pre>
+</div>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Use the GUI to generate a few .event files using commands from the service interface
+and the possibility to generate an error by the coin checker interface.
+Observe that the Reset operation requires the selection of a result.</p>
+</li>
+<li>
+<p>Apply monitoring (right-click on <em>VendingMachine.prj</em> and
+choose "Run As &gt; CommaSuite Generation and Monitoring") to check all <em>.event</em> files.
+Inspect the result in folder <em>comma-gen</em>. Improve the state machine when needed.</p>
+</li>
+</ul>
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_specify_the_user_interface"><a class="anchor" href="#_specify_the_user_interface"></a>Specify the user interface</h4>
+<div class="paragraph">
+<p>Next the user interface is specified.
+Folder IUser contains the following files:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p><em>IUser.signature</em>  with the signature of the user interface</p>
+</li>
+<li>
+<p><em>IUser.interface</em> with a dummy state machine which is adapted in the following activities.</p>
+</li>
+</ul>
+</div>
+<div class="sect4">
+<h5 id="_activity_10_state_machine_user_interface"><a class="anchor" href="#_activity_10_state_machine_user_interface"></a>Activity 10: State machine user interface</h5>
+<div class="paragraph">
+<p>To specify the behavior of the interface, first define and initialize two variables:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>a variable of type <em>integer</em> to represent the credit of the user, initialize it to 0;</p>
+</li>
+<li>
+<p>a variable of type <em>pricesMap</em> (see <em>VendingMachine.types</em>) to represent
+the prices of the product, where cola costs 3, juice costs 2, and water costs 1.
+The cheat sheet contains an example of maps and also the help might be useful, see Help &gt; Help Contents &gt; CommaSuite User Guide &gt; CommaSuite Languages &gt; CommaSuite Statements
+and Expressions.</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>Next define the state machine of the IUser interface according to the following description:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>In the initial state, when there is no credit, only command <em>InsertCoin</em> is allowed.
+This command has an output parameter representing the credit when the command
+has been completed.
+This is specified as the first parameter in the reply,
+where the second one is of type <em>CoinResult</em>.
+See the CommaSuite User Guide in Eclipse &gt; CommaSuite Languages &gt; Interfaces &gt; Transitions.
+<em>InsertCoin</em> may have three possible results:</p>
+<div class="ulist">
+<ul>
+<li>
+<p>The coin is accepted and the credit is increased by one.</p>
+</li>
+<li>
+<p>The coin is not accepted and the credit is not changed.</p>
+</li>
+<li>
+<p>The machine is not operational; in this case the value of
+the out parameter is not specified, that is, any value is allowed.</p>
+</li>
+</ul>
+</div>
+</li>
+<li>
+<p>When the credit is positive, <em>InsertCoin</em> is also possible, as specified above.
+In addition, <em>ReturnMoney</em> is allowed, returning the total amount of credit.
+Finally, the command <em>OrderProduct</em> is allowed, which may
+have a number of possible responses:</p>
+<div class="ulist">
+<ul>
+<li>
+<p>NOT_OPERATIONAL to indicate the machine is not operational</p>
+</li>
+<li>
+<p>NOT_ENOUGH_MONEY to indicate that the credit is not sufficient</p>
+</li>
+<li>
+<p>NO_PRODUCTS_AVAILABLE to indicate that the credit is sufficient,
+but no products are available</p>
+</li>
+<li>
+<p>DELIVERED to indicate that the credit is sufficient and the product is delivered</p>
+</li>
+</ul>
+</div>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect4">
+<h5 id="_activity_11_check_the_specified_interfaces_by_monitoring"><a class="anchor" href="#_activity_11_check_the_specified_interfaces_by_monitoring"></a>Activity 11: Check the specified interfaces by monitoring</h5>
+<div class="ulist">
+<ul>
+<li>
+<p>Extend the project file <em>VendingMachine.prj</em> with an import of <em>IUser.interface</em>.
+Add a monitoring task for the IUser interface.</p>
+</li>
+<li>
+<p>Use the GUI to generate .event files using commands from all interfaces.</p>
+</li>
+<li>
+<p>Apply monitoring to check all .event files.
+Inspect the coverage, the monitoring results and improve models when needed.</p>
+</li>
+</ul>
+</div>
+</div>
+<div class="sect4">
+<h5 id="_activity_12_define_time_and_data_constraints"><a class="anchor" href="#_activity_12_define_time_and_data_constraints"></a>Activity 12: Define time and data constraints</h5>
+<div class="paragraph">
+<p>A few constraints on time and data are added to interface IUser.</p>
+</div>
+<div class="olist arabic">
+<ol class="arabic">
+<li>
+<p>Write two time constraint for the following requirements:</p>
+<div class="olist loweralpha">
+<ol class="loweralpha" type="a">
+<li>
+<p>the reply of a command to return money occurs between 1000.0 ms and 5000.0 ms</p>
+</li>
+<li>
+<p>when an <em>OrderProduct</em> leads to a delivered product, the reply occurs within 3.0 ms</p>
+</li>
+</ol>
+</div>
+</li>
+<li>
+<p>Use the GUI to create a .event file where a coin is inserted many times and
+money is returned frequently.
+Similarly, construct a .events file where products are delivered several times.</p>
+</li>
+<li>
+<p>Run the monitoring and inspect the results; note that violations to time constraints
+lead to warnings.</p>
+</li>
+<li>
+<p>When a trace is checked against time constraints, statistical information is collected.
+The information is located in folder <em>comma-gen/&lt;taskname&gt;/statistics</em>
+in a file with extension .statistics.
+You can view different charts by right-clicking on a file with extension .statistics
+and choosing menu <em>Show Statistics Charts</em>.
+You can find more information about statistics in CommaSuite Help,
+section <em>Generation of Statistics.</em></p>
+</li>
+</ol>
+</div>
+</div>
+<div class="sect4">
+<h5 id="_activity_13_define_a_data_constraint"><a class="anchor" href="#_activity_13_define_a_data_constraint"></a>Activity 13: Define a Data Constraint</h5>
+<div class="olist arabic">
+<ol class="arabic" start="1">
+<li>
+<p>Add the following data constraint which expresses that when the return of
+money is requested,
+the delivered amount cannot be negative:</p>
+</li>
+</ol>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code>data constraints
+variables
+int val
+
+returnReg command ReturnMoney;reply(val) where val &gt;= 0</code></pre>
+</div>
+</div>
+<div class="olist arabic">
+<ol class="arabic" start="2">
+<li>
+<p>Run the monitoring and inspect the results.</p>
+</li>
+</ol>
+</div>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_specify_a_component"><a class="anchor" href="#_specify_a_component"></a>Specify a component</h3>
+<div class="paragraph">
+<p>The actions in this section illustrate the specification of a
+component with provided and required interfaces.
+Also relations between these interfaces can be expressed.</p>
+</div>
+<div class="sect3">
+<h4 id="_add_component_constraints"><a class="anchor" href="#_add_component_constraints"></a>Add component constraints</h4>
+<div class="paragraph">
+<p>Constraints on relations between events of different interfaces can be expressed
+in a CommaSuite component specifications with extension .component.
+As an illustration we consider a vending machine component with interfaces
+as depicted in <a href="#img_interfaces_vm">[img_interfaces_vm]</a>.</p>
+</div>
+<div class="sect4">
+<h5 id="_activity_15_define_component_and_functional_constraint"><a class="anchor" href="#_activity_15_define_component_and_functional_constraint"></a>Activity 15: Define component and functional constraint</h5>
+<div class="paragraph">
+<p>Create in the main project directory a file <em>VendingMachine.component</em>
+using File &gt; New &gt; File, with the VendingMachine project as parent.
+Insert the following text (you may copy the text below):</p>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code>import "IUser/IUser.interface"
+import "IService/IService.interface"
+import "ICoinCheck/ICoinCheck.interface"
+
+component VendingMachine
+
+provided port IUser vmUserPort
+provided port IService vmServicePort
+required port ICoinCheck vmCoinPort
+
+functional constraints
+
+OperationalConstraintInsertCoin {
+    /* InsertCoin Command of IUser returns NOT_OPERATIONAL
+     * when IService is not in state Operational
+     * Otherwise it returns ACCEPTED or NOT_ACCEPTED
+     */
+    use events
+    vmUserPort::reply to command InsertCoin
+
+    initial state CoinReply {
+        vmUserPort::reply (*,CoinResult::NOT_OPERATIONAL) to command InsertCoin
+             where NOT vmServicePort in Operational
+        next state: CoinReply
+
+        vmUserPort::reply (*,CoinResult::ACCEPTED) to command InsertCoin
+             where vmServicePort in Operational
+        next state: CoinReply
+
+        vmUserPort::reply (*,CoinResult::NOT_ACCEPTED) to command InsertCoin
+             where vmServicePort in Operational
+        next state: CoinReply
+    }
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Improve the lay-out using <em>&lt;CTRL&gt;-&lt;SHIFT&gt;-F</em>.</p>
+</div>
+<div class="paragraph">
+<p>This specification assumes that interface IService has a state called <em>Operational</em>
+to represent that the machine is on and not in an error.
+Replace it with the state name of your model.</p>
+</div>
+<div class="paragraph">
+<p>The functional constraint restricts the reply to command <em>InsertCoin</em>
+as indicated in the <span class="purple">use events</span> part.
+The specification expresses that when a reply to <em>InsertCoin</em> occurs,
+one of the following cases should hold:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>the result is NOT_OPERATIONAL and
+the state machine of the vmServicePort in not in state Operational, or</p>
+</li>
+<li>
+<p>the result is ACCEPTED and
+the state machine of the vmServicePort in in state Operational, or</p>
+</li>
+<li>
+<p>the result is NOT_ACCEPTED and
+the state machine of the vmServicePort in in state Operational.</p>
+</li>
+</ul>
+</div>
+<div class="paragraph">
+<p>To monitor the component constraints, change the file <em>VendingMachine.prj</em> as follows:</p>
+</div>
+<div class="ulist">
+<ul>
+<li>
+<p>Import <em>VendingMachine.component</em></p>
+</li>
+<li>
+<p>Remove the current monitoring tasks</p>
+</li>
+<li>
+<p>Add the following monitoring task:</p>
+</li>
+</ul>
+</div>
+<div class="listingblock">
+<div class="content">
+<pre class="highlight"><code>Generate Monitors {
+   monitoring for component VendingMachine {
+      trace directories "VendingMachineEventsFiles"
+   }
+}</code></pre>
+</div>
+</div>
+<div class="paragraph">
+<p>Component monitoring checks the components constraints and all interfaces of the component.</p>
+</div>
+<div class="paragraph">
+<p>Run monitoring and inspect the result in folder <em>comma-gen/monitoring</em>.
+Note that the folder contains and a summary of all errors and warnings.
+Moreover, the coverage file provides an overview of all component interfaces.</p>
+</div>
+</div>
+<div class="sect4">
+<h5 id="_activity_15_define_additional_component_constraints"><a class="anchor" href="#_activity_15_define_additional_component_constraints"></a>Activity 15: Define additional component constraints</h5>
+<div class="ulist">
+<ul>
+<li>
+<p>Define a functional constraint for the vending machine component
+which expresses that each <em>Reset</em> on the service port is followed
+by a <em>ResetCoinChecker</em> on the coin check port.</p>
+</li>
+<li>
+<p>Define a time constraint (after heading <span class="purple"><strong>timing constraints</strong></span>)
+which expresses that an <em>CoinCheckerProblem</em> notification on the coin check port
+is followed by an <em>OutOfOrder</em> notification on the service port within 2 ms.</p>
+</li>
+<li>
+<p>Run monitoring and inspect the results.</p>
+</li>
+</ul>
+</div>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_concluding_remarks"><a class="anchor" href="#_concluding_remarks"></a>Concluding remarks</h3>
+<div class="paragraph">
+<p>As mentioned in the introduction, the CommaSuite tooling includes a
+number of additional features,
+such as simulation and the generation of stubs and tests.
+Monitoring is supported by command-line tooling that can be integrated.
+For instance, to perform monitoring after smoke tests automatically.</p>
+</div>
+<div class="paragraph">
+<p>In the case study we started from an existing implementation and gradually
+modeled its interfaces, checking conformance by manually constructing traces and
+applying the generated monitoring.
+An alternative is to generate test cases or a test client based on the CommaSuite model.
+CommaSuite is also frequently applied for the definition of new interfaces,
+for instance of third party components.
+In these case, model simulation can be useful to validate the model.
+Stubs might support the independent development of client and server.
+Monitoring or test generation can be exploited to check if the implementations
+conform to the interface models.</p>
+</div>
+</div>
+</div>
+</div>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/site/download.html b/site/tutorial/userinterface.html
similarity index 83%
copy from site/download.html
copy to site/tutorial/userinterface.html
index 1bafd3b..1faaae7 100644
--- a/site/download.html
+++ b/site/tutorial/userinterface.html
@@ -441,105 +441,27 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="font-weight: bold" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="../index.html">Home</a></li><li><a style="" href="../site/download.html">Download</a></li><li><a style="" href="../site/developers.html">Developers</a></li><li><a style="" href="../user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="../overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="../overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="../language/language.html">Language</a><ul class="sectlevel4"><li><a style="" href="../language/types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="../language/states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="../language/generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="../language/components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="../language/comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="../generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="../generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="../generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="font-weight: bold" href="userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="../commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="../eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="../shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="../problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">
 <div class="sect1">
-<h2 id="_download"><a class="anchor" href="#_download"></a>Download</h2>
+<h2 id="_specify_the_user_interface"><a class="anchor" href="#_specify_the_user_interface"></a>Specify the user interface</h2>
 <div class="sectionbody">
-<div class="paragraph">
-<p>There are three possibilities to install Eclipse CommaSuite:</p>
+<div class="paragraph normal">
+<p>Next the user interface is specified.
+Folder IUser contains the following files:</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>Download a <strong>product</strong>, which is a completely installed Eclipse:</p>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32" target="_blank" rel="noopener">Windows</a></p>
+<p><em>IUser.signature</em>  with the signature of the user interface</p>
 </li>
 <li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux" target="_blank" rel="noopener">Linux</a></p>
-</li>
-<li>
-<p><a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos" target="_blank" rel="noopener">macOS</a></p>
+<p><em>IUser.interface</em> with a dummy state machine which is adapted in the following activities.</p>
 </li>
 </ul>
 </div>
-</li>
-<li>
-<p>Install it as a <strong>plugin</strong> into an existing version of the Eclipse tool:</p>
-<div class="olist arabic">
-<ol class="arabic">
-<li>
-<p>Open Eclise and go to <em>Help</em> &#8594; <em>Install new software</em></p>
-</li>
-<li>
-<p>Click <em>Add&#8230;&#8203;</em>, for <em>Name</em> fill in <code>Eclipse CommaSuite</code> and <em>Location</em> <code><a href="https://download.eclipse.org/comma/latest/plugin/update-site" class="bare">https://download.eclipse.org/comma/latest/plugin/update-site</a></code>, click <em>Add</em></p>
-</li>
-<li>
-<p>Put a check mark before <em>Eclipse CommaSuite (Incubation)</em> and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Next</em> again, accept license agreement and click <em>Next</em></p>
-</li>
-<li>
-<p>Click <em>Finish</em>, a security warning will pop up, click <em>Install anyway</em></p>
-</li>
-<li>
-<p>Once the installation is finished Eclipse will ask to restart, click <em>Restart now</em></p>
-</li>
-<li>
-<p>The Eclipse CommaSuite plugin is now installed</p>
-</li>
-</ol>
-</div>
-</li>
-<li>
-<p>As a <strong>command line tool</strong> (<code>.jar</code> file). Documentation about the command line tool can be found in the <a href="../commandline/commandline.html">Eclipse CommaSuite User Guide</a>. Download link: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest" target="_blank" rel="noopener">comma.jar</a>.</p>
-</li>
-</ul>
-</div>
-<div class="sect2">
-<h3 id="_changelog"><a class="anchor" href="#_changelog"></a>Changelog</h3>
-<div class="paragraph">
-<p>The changelog of each release can be found on <a href="https://gitlab.eclipse.org/eclipse/comma/comma/-/releases" target="_blank" rel="noopener">Gitlab</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_older_releases"><a class="anchor" href="#_older_releases"></a>Older releases</h3>
-<div class="paragraph">
-<p>Older release of Eclipse CommaSuite can be obtained via <a href="https://download.eclipse.org/comma/" target="_blank" rel="noopener">download.eclipse.org/comma</a>.
-Note that downloading directly from download.eclipse.org/comma will result in slower download speeds since no mirror is used. Archived releases can be found under <a href="https://archive.eclipse.org/comma" target="_blank" rel="noopener">https://archive.eclipse.org/comma</a>.</p>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_direct_urls"><a class="anchor" href="#_direct_urls"></a>Direct URLs</h3>
-<div class="paragraph">
-<p>In case you want to download Eclipse CommaSuite with e.g. <code>curl</code> or <code>wget</code> the following URLs can be used:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Windows latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=win32&amp;direct</a></p>
-</li>
-<li>
-<p>Linux latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=linux&amp;direct</a></p>
-</li>
-<li>
-<p>MacOS latest product: <a href="http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=product&amp;version=latest&amp;os=macos&amp;direct</a></p>
-</li>
-<li>
-<p>CLI jar latest: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=latest&amp;direct</a></p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>To download a specific version change the <code>version</code> parameter, e.g. CLI jar v0.1.0: <a href="http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct" class="bare">http://download.eclipse.org/comma/download.php?type=cli&amp;version=v0.1.0&amp;direct</a></p>
-</div>
-</div>
 </div>
 </div>
 </div>
diff --git a/site/user_guide.html b/site/user_guide.html
index 1a5f2c5..b5d9a27 100644
--- a/site/user_guide.html
+++ b/site/user_guide.html
@@ -441,7 +441,7 @@
 <div id="header">
 <div id="toc" class="toc2">
 <div id="toctitle">Index</div>
-<ul class="sectlevel1"><li><a style="" href="/index.html">Home</a></li><li><a style="" href="/site/download.html">Download</a></li><li><a style="" href="/site/developers.html">Developers</a></li><li><a style="font-weight: bold" href="/site/user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="/overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="/overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="/language/language.html">Language</a><ul class="sectlevel4"><li><a style="" href="/language/types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="/language/interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="/language/statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="/language/states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="/language/transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="/language/timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="/language/data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="/language/generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="/language/components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="/language/expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="/language/comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="/generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="/generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="/generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="/generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="/generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="/generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="/tutorial/intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="/tutorial/preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="/tutorial/serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="/tutorial/activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="/tutorial/activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="/tutorial/activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="/tutorial/activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="/tutorial/activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="/tutorial/activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="/tutorial/coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="/tutorial/activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="/tutorial/activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="/tutorial/userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="/tutorial/activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="/tutorial/activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="/tutorial/activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="/tutorial/activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="/tutorial/componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="/tutorial/activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="/tutorial/activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="/tutorial/concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="/commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="/eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="/shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="/problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
+<ul class="sectlevel1"><li><a style="" href="index.html">Home</a></li><li><a style="" href="site/download.html">Download</a></li><li><a style="" href="site/developers.html">Developers</a></li><li><a style="font-weight: bold" href="user_guide.html">User guide</a><ul class="sectlevel2"><li><a style="" href="overview/intro.html">Language overview</a><ul class="sectlevel3"><li><a style="" href="overview/gettingstarted.html">Getting started</a><ul class="sectlevel4"></ul></li><li><a style="" href="language/language.html">Language</a><ul class="sectlevel4"><li><a style="" href="language/types.html">Types</a><ul class="sectlevel5"></ul></li><li><a style="" href="language/interfaces.html">Interface signatures</a><ul class="sectlevel5"></ul></li><li><a style="" href="language/statemachines.html">Interfaces</a><ul class="sectlevel5"><li><a style="" href="language/states.html">States</a><ul class="sectlevel6"></ul></li><li><a style="" href="language/transitions.html">Transitions</a><ul class="sectlevel6"></ul></li><li><a style="" href="language/timing_constraints.html">Timing constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="language/data_constraints.html">Data constraints</a><ul class="sectlevel6"></ul></li><li><a style="" href="language/generic_constraints.html">Generic constraints</a><ul class="sectlevel6"></ul></li></ul></li><li><a style="" href="language/components.html">Components</a><ul class="sectlevel5"></ul></li><li><a style="" href="language/expressions.html">Statements and expressions</a><ul class="sectlevel5"></ul></li><li><a style="" href="language/comments.html">Documenting models</a><ul class="sectlevel5"></ul></li></ul></li></ul></li><li><a style="" href="generators/generators.html">Generator tasks</a><ul class="sectlevel3"><li><a style="" href="generators/umlgeneration.html">Generation of UML diagrams</a><ul class="sectlevel4"></ul></li><li><a style="" href="generators/docgeneration.html">Document generation</a><ul class="sectlevel4"></ul></li><li><a style="" href="generators/monitoring.html">Monitoring</a><ul class="sectlevel4"></ul></li><li><a style="" href="generators/reachabilitygraph.html">Reachability graph</a><ul class="sectlevel4"></ul></li><li><a style="" href="generators/testgeneration.html">Test generation</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="tutorial/intro.html">Tutorial</a><ul class="sectlevel3"><li><a style="" href="tutorial/preparation.html">Preparation</a><ul class="sectlevel4"></ul></li><li><a style="" href="tutorial/serviceinterface.html">Service interface</a><ul class="sectlevel4"><li><a style="" href="tutorial/activity1.html">Activity 1: Get familiar with the Vending Machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="tutorial/activity2.html">Activity 2: Make an initial specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="tutorial/activity3.html">Activity 3: Check an execution trace against the state machine</a><ul class="sectlevel5"></ul></li><li><a style="" href="tutorial/activity4.html">Activity 4: Extend the specification of the service interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="tutorial/activity5.html">Activity 5: Add a time constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="tutorial/activity6.html">Activity 6: Documentation generation</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="tutorial/coincheckinterface.html">Coin checker interface</a><ul class="sectlevel4"><li><a style="" href="tutorial/activity7.html">Activity 7: State machine of the coin checker</a><ul class="sectlevel5"></ul></li><li><a style="" href="tutorial/activity8.html">Activity 8: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="tutorial/userinterface.html">User interface</a><ul class="sectlevel4"><li><a style="" href="tutorial/activity9.html">Activity 9: State machine of the user interface</a><ul class="sectlevel5"></ul></li><li><a style="" href="tutorial/activity10.html">Activity 10: Check the specified interfaces by monitoring</a><ul class="sectlevel5"></ul></li><li><a style="" href="tutorial/activity11.html">Activity 11: Define time constraints</a><ul class="sectlevel5"></ul></li><li><a style="" href="tutorial/activity12.html">Activity 12: Define a data constraint</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="tutorial/componentmodel.html">Component model</a><ul class="sectlevel4"><li><a style="" href="tutorial/activity13.html">Activity 13: Define component and add functional constraint</a><ul class="sectlevel5"></ul></li><li><a style="" href="tutorial/activity14.html">Activity 14: Define additional component constraints</a><ul class="sectlevel5"></ul></li></ul></li><li><a style="" href="tutorial/concludingremarks.html">Concluding remarks</a><ul class="sectlevel4"></ul></li></ul></li><li><a style="" href="commandline/commandline.html">Command line tool</a><ul class="sectlevel3"></ul></li><li><a style="" href="eventfiles/eventfiles.html">Event files</a><ul class="sectlevel3"></ul></li><li><a style="" href="shortcuts/shortcuts.html">Shortcuts</a><ul class="sectlevel3"></ul></li><li><a style="" href="problems/problemsolving.html">Problem solving</a><ul class="sectlevel3"></ul></li></ul></li></ul>
 </div>
 </div>
 <div id="content">