From 0404a825d2105c776bae0aabae7b4db3424eea8c Mon Sep 17 00:00:00 2001
From: Stéphane Bégaudeau
Date: Tue, 30 Jan 2018 14:05:58 +0100
Subject: [doc] Update the release notes

Change-Id: Ic657acfa6deb7bd1d7dd85c6da237dfd559474f5
Signed-off-by: Stéphane Bégaudeau <stephane.begaudeau@obeo.fr>
---
 doc/org.eclipse.eef.documentation/pages/releasenotes.html    | 1 +
 doc/org.eclipse.eef.documentation/pages/releasenotes.textile | 1 +
 2 files changed, 2 insertions(+)

diff --git a/doc/org.eclipse.eef.documentation/pages/releasenotes.html b/doc/org.eclipse.eef.documentation/pages/releasenotes.html
index 86d382e89..587753016 100644
--- a/doc/org.eclipse.eef.documentation/pages/releasenotes.html
+++ b/doc/org.eclipse.eef.documentation/pages/releasenotes.html
@@ -56,6 +56,7 @@
 		<ul>
 			<li><span class="label label-success">Added</span> A conflict resolution policy has been added to the Text widget. The implementation of the text widget now uses a new preference TEXT_CONFLICT_RESOLUTION_MODE, which is not exposed in the UI but can be configured programmatically using EEFPreferences.setTextConflictResolutionMode(). The default preference value can also be overridden by configuration, using the -pluginCustomization startup flag to point to a plugin_customization.ini file with, for example: org.eclipse.eef.ide.ui/TEXT_CONFLICT_RESOLUTION_MODE=USE_LOCAL_VERSION. EEFTextLifecycleManager supports three modes. First, USE_MODEL_VERSION which will overwrite the widget&#8217;s content with the value computed from the new version of the model (no user feedback). This is the default behavior. Second, USE_LOCAL_VERSION which will keep the current value begin edited by the end-user in the widget (no user feedback). Third, ASK_USER which will open a simple dialog box to ask the user which version to keep. Note that the simple dialog provided is only suitable for short (single-line) text fields.</li>
 			<li><span class="label label-info">Modified</span> Fix an issue with the refresh of list widgets</li>
+			<li><span class="label label-info">Modified</span> Fix an issue with the conditional style of the text widgets</li>
 		</ul>
 		<h4 id="DeveloperVisibleChanges">Developer-Visible Changes</h4>
 		<ul>
diff --git a/doc/org.eclipse.eef.documentation/pages/releasenotes.textile b/doc/org.eclipse.eef.documentation/pages/releasenotes.textile
index eea29ce0c..314e6a0db 100644
--- a/doc/org.eclipse.eef.documentation/pages/releasenotes.textile
+++ b/doc/org.eclipse.eef.documentation/pages/releasenotes.textile
@@ -10,6 +10,7 @@ h4. User-Visible Changes
 
 * <span class="label label-success">Added</span> A conflict resolution policy has been added to the Text widget. The implementation of the text widget now uses a new preference TEXT_CONFLICT_RESOLUTION_MODE, which is not exposed in the UI but can be configured programmatically using EEFPreferences.setTextConflictResolutionMode(). The default preference value can also be overridden by configuration, using the -pluginCustomization startup flag to point to a plugin_customization.ini file with, for example: org.eclipse.eef.ide.ui/TEXT_CONFLICT_RESOLUTION_MODE=USE_LOCAL_VERSION. EEFTextLifecycleManager supports three modes. First, USE_MODEL_VERSION which will overwrite the widget's content with the value computed from the new version of the model (no user feedback). This is the default behavior. Second, USE_LOCAL_VERSION which will keep the current value begin edited by the end-user in the widget (no user feedback). Third, ASK_USER which will open a simple dialog box to ask the user which version to keep. Note that the simple dialog provided is only suitable for short (single-line) text fields.
 * <span class="label label-info">Modified</span> Fix an issue with the refresh of list widgets
+* <span class="label label-info">Modified</span> Fix an issue with the conditional style of the text widgets
 
 h4. Developer-Visible Changes
 
-- 
cgit v1.2.3