Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre-Charles David2018-10-09 14:21:42 +0000
committerPierre-Charles David2018-10-10 11:40:35 +0000
commit1b06f8731778775322688dec2b807d9cb827878c (patch)
treefcf5e979a885198a8c642e18a79ffbc214975d9d
parentef5133ac9c9ed19bc8f29320cba52f0aa8e023d2 (diff)
downloadorg.eclipse.sirius-1b06f8731778775322688dec2b807d9cb827878c.tar.gz
org.eclipse.sirius-1b06f8731778775322688dec2b807d9cb827878c.tar.xz
org.eclipse.sirius-1b06f8731778775322688dec2b807d9cb827878c.zip
[527277] Mention the license change in the release notes
Bug: 527277 Change-Id: Iba4eab72a36de29c3b374e8fc372885c7468c988 Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>
-rw-r--r--plugins/org.eclipse.sirius.doc/doc/Release_Notes.html15
-rw-r--r--plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile3
2 files changed, 12 insertions, 6 deletions
diff --git a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
index fa6ce18dc6..3818e6e6bd 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
+++ b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
@@ -72,11 +72,16 @@
<a href="Release_Notes_Previous.html">the release notes from previous versions</a> for details about older releases.
</p>
<h2 id="sirius6.1.0">Changes in Sirius 6.1.0</h2>
- <p>
- <em>Note:</em> The new (and still experimental)
- <em>Workflow</em> and
- <em>Server</em> features depend on a specific version of Eclipse Jetty which is available in the main Eclipse Photon repository. They can not be used under Oxygen (which include older and incompatible versions of Jetty).
- </p>
+ <ul>
+ <li><span class="label label-info">IMPORTANT</span> The new (and still experimental)
+ <em>Workflow</em> and
+ <em>Server</em> features depend on a specific version of Eclipse Jetty which is available in the main Eclipse Photon repository. They can not be used under Oxygen (which include older and incompatible versions of Jetty).
+ </li>
+ <li><span class="label label-info">IMPORTANT</span> Please note that starting from version 6.1, Sirius is now licensed under
+ <a href="https://www.eclipse.org/legal/epl-2.0/">version 2.0 of the Eclipse Public License</a>, which updates some wording and clarifies some points but neither changes the open-source nature of Sirius nor the implications of using or embedding it. See
+ <a href="https://www.eclipse.org/legal/epl-2.0/faq.php">the official FAQ</a> for details about the difference between EPL v1.0 (which was used before) and v2.0.
+ </li>
+ </ul>
<h3 id="UserVisibleChanges">User-Visible Changes</h3>
<ul>
<li><span class="label label-success">Added</span> A new preference has been added in the Sirius preference panel. It allows Sirius to ask the user if he wants to save session resources after an automatic migration. If the new preference is ticked, the pop-up will only appear for session opening caused by a direct action of the user (i.e. opening a diagram or unfolding the resources in the model explorer). You can refer to the
diff --git a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
index d63f062fb2..2b8521d17e 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
+++ b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
@@ -6,7 +6,8 @@ This document contains the release notes for recent major releases of Sirius. Se
h2(#sirius6.1.0). Changes in Sirius 6.1.0
-_Note:_ The new (and still experimental) _Workflow_ and _Server_ features depend on a specific version of Eclipse Jetty which is available in the main Eclipse Photon repository. They can not be used under Oxygen (which include older and incompatible versions of Jetty).
+* <span class="label label-info">IMPORTANT</span> The new (and still experimental) _Workflow_ and _Server_ features depend on a specific version of Eclipse Jetty which is available in the main Eclipse Photon repository. They can not be used under Oxygen (which include older and incompatible versions of Jetty).
+* <span class="label label-info">IMPORTANT</span> Please note that starting from version 6.1, Sirius is now licensed under "version 2.0 of the Eclipse Public License":https://www.eclipse.org/legal/epl-2.0/, which updates some wording and clarifies some points but neither changes the open-source nature of Sirius nor the implications of using or embedding it. See "the official FAQ":https://www.eclipse.org/legal/epl-2.0/faq.php for details about the difference between EPL v1.0 (which was used before) and v2.0.
h3. User-Visible Changes

Back to the top