Merge "Bug 536769 - [room.ui] Use new DC tools for content assist" into newfsmgen_finalize
diff --git a/plugins/org.eclipse.etrice.doc/online-doc/config/_master.json b/plugins/org.eclipse.etrice.doc/online-doc/config/_master.json
index 0382c21..c70e3d1 100644
--- a/plugins/org.eclipse.etrice.doc/online-doc/config/_master.json
+++ b/plugins/org.eclipse.etrice.doc/online-doc/config/_master.json
@@ -1,6 +1,6 @@
{
"title": "eTrice Documentation",
- "version": "1.0",
+ "version": "2.x",
"xtext-langs" : {
"room" : "xtext_keyword_files/InternalRoom.tokens",
"etconfig" : "xtext_keyword_files/InternalConfig.tokens",
diff --git a/plugins/org.eclipse.etrice.doc/online-doc/content/release-notes.md b/plugins/org.eclipse.etrice.doc/online-doc/content/release-notes.md
index d57c18f..7329afb 100644
--- a/plugins/org.eclipse.etrice.doc/online-doc/content/release-notes.md
+++ b/plugins/org.eclipse.etrice.doc/online-doc/content/release-notes.md
@@ -4,7 +4,7 @@
Noteworthy release changes are described here.
-1.1.3 Migration
+2.0.0 Migration
--------------------------
<span class="label label-danger">Breaking Changes:</span> This release contains a breaking change to models used with previous versions.
@@ -21,6 +21,6 @@
<span class="label label-info">Note:</span> The migration assistant relies on the message data names, thus the names should not be removed until you have fully migrated your project and all dependent projects.
<br/>
-In addition eTrice now uses the so-called *Smart Strings* for user code. This is not a breaking change, but it is recommended to migrate to this new syntax also. Using the Transition Data migration action will automatically convert all affected user codes into Smart Strings. Further there is a dedicated migration action for the Smart Strings, see **Migrate to Smart Action Codes** above. Additionally there is a quickfix available:
+In addition eTrice now uses the so-called **Smart Strings** for user code. This is not a breaking change, but it is recommended to migrate to this new syntax also. Using the Transition Data migration action will automatically convert all affected user codes into Smart Strings. Further there is a dedicated migration action for the Smart Strings, see *Migrate to Smart Action Codes* above. Additionally there is a quickfix available:
diff --git a/plugins/org.eclipse.etrice.doc/targets/eclipse-help/etrice-doc.html b/plugins/org.eclipse.etrice.doc/targets/eclipse-help/etrice-doc.html
index 2cfa1d0..f9d3225 100644
--- a/plugins/org.eclipse.etrice.doc/targets/eclipse-help/etrice-doc.html
+++ b/plugins/org.eclipse.etrice.doc/targets/eclipse-help/etrice-doc.html
@@ -17,7 +17,7 @@
<div style="text-align:center;">
<p><img src="images/logo/etrice-logo-interim.png"></p>
<h1>eTrice Documentation</h1>
-<p>version 1.0</p>
+<p>version 2.x</p>
</div>
<!-- front page + toc--->
@@ -1325,7 +1325,7 @@
<li><a href="release-notes.html">Release Notes</a>
<ul>
-<li><a href="release-notes.html#1-1-3-migration">1.1.3 Migration</a></li>
+<li><a href="release-notes.html#2-0-0-migration">2.0.0 Migration</a></li>
diff --git a/plugins/org.eclipse.etrice.doc/targets/eclipse-help/release-notes.html b/plugins/org.eclipse.etrice.doc/targets/eclipse-help/release-notes.html
index 3a6eadb..de7f03d 100644
--- a/plugins/org.eclipse.etrice.doc/targets/eclipse-help/release-notes.html
+++ b/plugins/org.eclipse.etrice.doc/targets/eclipse-help/release-notes.html
@@ -16,7 +16,7 @@
<h1><a href="#release-notes" name="release-notes"></a>Release Notes</h1>
<p>Noteworthy release changes are described here.</p>
-<h2><a href="#1-1-3-migration" name="1-1-3-migration"></a>1.1.3 Migration</h2>
+<h2><a href="#2-0-0-migration" name="2-0-0-migration"></a>2.0.0 Migration</h2>
<p><span class="label label-danger">Breaking Changes:</span> This release contains a breaking change to models used with previous versions.</p>
<p>The name of the data for protocol messages is not longer used and is marked as deprecated. In state machines the message data is now named <code>transitionData</code>. Thus <strong>all occurrences of the message data have to be renamed</strong>. The changes to the model are depicted in the picture below:</p>
<p><img src="images/600-TransitionDataMigration.png" alt="image"></p>
@@ -24,7 +24,7 @@
<p><img src="images/600-TransitionDataMigrationAssitant.png" alt="image"></p>
<p><span class="label label-info">Note:</span> The migration assistant relies on the message data names, thus the names should not be removed until you have fully migrated your project and all dependent projects.</p>
<br>
-<p>In addition eTrice now uses the so-called <em>Smart Strings</em> for user code. This is not a breaking change, but it is recommended to migrate to this new syntax also. Using the Transition Data migration action will automatically convert all affected user codes into Smart Strings. Further there is a dedicated migration action for the Smart Strings, see <strong>Migrate to Smart Action Codes</strong> above. Additionally there is a quickfix available:</p>
+<p>In addition eTrice now uses the so-called <strong>Smart Strings</strong> for user code. This is not a breaking change, but it is recommended to migrate to this new syntax also. Using the Transition Data migration action will automatically convert all affected user codes into Smart Strings. Further there is a dedicated migration action for the Smart Strings, see <em>Migrate to Smart Action Codes</em> above. Additionally there is a quickfix available:</p>
<p><img src="images/600-DetailcodeMigration.png" alt="image"></p>
</body>
diff --git a/plugins/org.eclipse.etrice.doc/targets/eclipse-help/toc-topics.xml.html b/plugins/org.eclipse.etrice.doc/targets/eclipse-help/toc-topics.xml.html
index aee1cd7..df79d8d 100644
--- a/plugins/org.eclipse.etrice.doc/targets/eclipse-help/toc-topics.xml.html
+++ b/plugins/org.eclipse.etrice.doc/targets/eclipse-help/toc-topics.xml.html
@@ -169,7 +169,7 @@
</topic>
</topic>
</topic><topic href="targets/eclipse-help/release-notes.html" label="Release Notes">
-<topic href="targets/eclipse-help/release-notes.html#1-1-3-migration" label="1.1.3 Migration">
+<topic href="targets/eclipse-help/release-notes.html#2-0-0-migration" label="2.0.0 Migration">
</topic>
</topic>
</toc>
\ No newline at end of file
