* Bug #13384 fixed - uicontrol help page did not mention axes could be contained...

Change-Id: Ia00e9555a794a82d810f9e4cea17c0f8dd83c437

diff --git a/scilab/CHANGES_5.5.X b/scilab/CHANGES_5.5.X
index f849399..be96d6f 100644 (file)
--- a/scilab/CHANGES_5.5.X
+++ b/scilab/CHANGES_5.5.X
@@ -19,6 +19,9 @@ Scilab Bug Fixes
 * Bug #13383 fixed - newaxes help page did not mention the call with a graphic
                      handle as input.
 
+* Bug #13384 fixed - uicontrol help page did not mention axes could be contained
+                     in frame style uicontrols.
+
 
 Xcos Bug Fixes
 ==============

diff --git a/scilab/modules/gui/help/en_US/uicontrol.xml b/scilab/modules/gui/help/en_US/uicontrol.xml
index b35cb73..326c3bb 100644 (file)
--- a/scilab/modules/gui/help/en_US/uicontrol.xml
+++ b/scilab/modules/gui/help/en_US/uicontrol.xml
@@ -70,7 +70,7 @@
                 <para>Edit: an editable string zone.</para>
             </listitem>
             <listitem>
-                <para>Frame: a container for other uicontrols.
+                <para>Frame: a container for other uicontrols or axes.
                 </para>
             </listitem>
             <listitem>
@@ -78,7 +78,7 @@
             </listitem>
             <listitem>
                 <para>
-                    Layer: a container for <literal>frame</literal> style uicontrols enbaling to switch between them programmatically using the <literal>value</literal> property.
+                    Layer: a container for <literal>frame</literal> style uicontrols enabling to switch between them programmatically using the <literal>value</literal> property.
                 </para>
             </listitem>
             <listitem>