[505768] Update specifier guide doc for table.

For edition table, the guide explained that style on column mapping
override style on line mapping but it is the opposite.

Bug: 505768
Change-Id: Ia04b4acad582479af6795a4d4d6d1290a59be650
Signed-off-by: jmallet <jessy.mallet@obeo.fr>

2 files changed, 6 insertions, 6 deletions

diff --git a/plugins/org.eclipse.sirius.doc/doc/specifier/tables/Tables.html b/plugins/org.eclipse.sirius.doc/doc/specifier/tables/Tables.html
index f85d8fb754..a7c428ec89 100644
--- a/plugins/org.eclipse.sirius.doc/doc/specifier/tables/Tables.html
+++ b/plugins/org.eclipse.sirius.doc/doc/specifier/tables/Tables.html
@@ -194,7 +194,7 @@
 		</p>
 		<h4 id="line_style">Line Style</h4>
 		<p>You can create 
-			<em>Style</em> elements inside a line mapping to set the default style of all the cells on this line (note that the actual style can be overridden by the column mappings).
+			<em>Style</em> elements inside a line mapping to set the default style of all the cells on this line (note that this style override the column mappings one).
 		</p>
 		<p>A 
 			<em>Foreground Style</em> element can be used to set the font size, font style (e.g. italic) and text color. A 
@@ -265,7 +265,7 @@
 			<em>Initial width</em>, if set to a non-zero value, is used as the initial width of the column.
 		</p>
 		<h4 id="column_styles">Column Styles</h4>
-		<p>Columns can contain style definition which, if present, override the styles which may be present in the line mappings for the cells of this column. The style definition elements, including support for conditional styles, is the same as for style associated to line mappings. Refer to 
+		<p>Columns can contain style definition to set the style of all the cells on these columns. However, these styles can be overridden by the styles which may be present in the line mappings for the cells of this column. The style definition elements, including support for conditional styles, is the same as for style associated to line mappings. Refer to 
 			<a href="#line_style">the corresponding section</a> for more details.
 		</p>
 		<h4 id="column_tools">Column Tools</h4>
@@ -318,7 +318,7 @@
 			<em>Delete Line</em> 
 			<a href="#line_tools">tools for line mappings</a>.
 		</p>
-		<p>They can also contain style definitions (including conditional style), which apply to all the cells in the column (unless overridden by the intersection mapping). For a given cell, the styles defined on the column mapping overrides the styles which are defined on the line mapping (if any).</p>
+		<p>They can also contain style definitions (including conditional style), which apply to all the cells in the column (unless overridden by the intersection mapping or by the line mapping if any).</p>
 		<h3 id="intersection_mapping">Intersection Mappings</h3>
 		<p>The line and element column mappings in a cross table define which lines and columns will be present in the tables, but not the contents of the cells. This is defined by 
 			<em>Intersection</em> mappings. The 
diff --git a/plugins/org.eclipse.sirius.doc/doc/specifier/tables/Tables.textile b/plugins/org.eclipse.sirius.doc/doc/specifier/tables/Tables.textile
index ab039e3b58..11fd872578 100644
--- a/plugins/org.eclipse.sirius.doc/doc/specifier/tables/Tables.textile
+++ b/plugins/org.eclipse.sirius.doc/doc/specifier/tables/Tables.textile
@@ -66,7 +66,7 @@ A _Line_ mapping may _Reuse Sub Lines_ (see the _Import_ category), including it
 
 h4(#line_style). Line Style
 
-You can create _Style_ elements inside a line mapping to set the default style of all the cells on this line (note that the actual style can be overridden by the column mappings).
+You can create _Style_ elements inside a line mapping to set the default style of all the cells on this line (note that this style override the column mappings one).
 
 A _Foreground Style_ element can be used to set the font size, font style (e.g. italic) and text color. A _Background Style_ can be used to set the background color. Both are optional.
 
@@ -94,7 +94,7 @@ Finally, the _Header Label Expression_ is used to compute the header of the colu
 
 h4(#column_styles). Column Styles
 
-Columns can contain style definition which, if present, override the styles which may be present in the line mappings for the cells of this column. The style definition elements, including support for conditional styles, is the same as for style associated to line mappings. Refer to "the corresponding section":#line_style for more details.
+Columns can contain style definition to set the style of all the cells on these columns. However, these styles can be overridden by the styles which may be present in the line mappings for the cells of this column. The style definition elements, including support for conditional styles, is the same as for style associated to line mappings. Refer to "the corresponding section":#line_style for more details.
 
 h4(#column_tools). Column Tools
 
@@ -122,7 +122,7 @@ In cross tables, columns represent elements instead of elements' properties (as
 
 _Element Column_ mappings can contain a _Create Column Tool_ and a _Delete Column Tool_, which are specified and behave in a similar way than the _Create Line_ and _Delete Line_ "tools for line mappings":#line_tools.
 
-They can also contain style definitions (including conditional style), which apply to all the cells in the column (unless overridden by the intersection mapping). For a given cell, the styles defined on the column mapping overrides the styles which are defined on the line mapping (if any).
+They can also contain style definitions (including conditional style), which apply to all the cells in the column (unless overridden by the intersection mapping or by the line mapping if any).
 
 h3(#intersection_mapping). Intersection Mappings