Revert "Bug 5362 Fixed: help type pointed to "Type" online help"
Pierre MARECHAL [Wed, 3 Feb 2010 15:02:05 +0000 (16:02 +0100)]
This reverts commit d561d86edffe30a2ff5ba9c7f900926e09afe1ec.

Conflicts:

scilab/CHANGES_5.2.X

scilab/CHANGES_5.2.X
scilab/modules/m2sci/help/en_US/Type.xml
scilab/modules/xcos/help/en_US/palettes/Mathoperations_pal/AA_Mathoperations_pal.xml
scilab/modules/xcos/help/en_US/palettes/Mathoperations_pal/SQRT.xml
scilab/modules/xcos/help/en_US/palettes/Matrix_pal/AA_Matrix_pal.xml

index 8d56f0d..018e8fe 100644 (file)
@@ -169,8 +169,6 @@ Bug fixes:
 
 * bug 5140 fixed - 'Load into Scilab' did not work as expected.
 
-* bug 5362 fixed - help type pointed to "Type" online help
-
 * bug 5413 fixed - help_from_sci was replacing the < > in the examples by
                    &gt; and &lt; causing issues in the build of documentation.
 
index 581b8fd..dededab 100644 (file)
@@ -10,7 +10,7 @@
     * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
     *
     -->
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="en" xml:id="Type_m2sci">
+<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" version="5.0-subset Scilab" xml:lang="en" xml:id="Type">
   <info>
     <pubdate>$LastChangedDate$</pubdate>
   </info>
index f717d00..de82a29 100644 (file)
 
       <listitem>
         <para>
-          <link linkend="SQRT_block">SQRT — Square root</link>
+          <link linkend="SQRT">SQRT — Square root</link>
         </para>
       </listitem>
 
index efc8443..adc1727 100644 (file)
@@ -21,7 +21,7 @@
  * 
  * See the file ./license.txt
  -->
-<refentry version="5.0-subset Scilab" xml:id="SQRT_block"
+<refentry version="5.0-subset Scilab" xml:id="SQRT"
           xmlns="http://docbook.org/ns/docbook"
           xmlns:xlink="http://www.w3.org/1999/xlink"
           xmlns:svg="http://www.w3.org/2000/svg"
@@ -52,7 +52,7 @@
     <itemizedlist>
       <listitem>
         <para>
-          <link linkend="SQRT_block">Square root</link>
+          <link linkend="SQRT">Square root</link>
         </para>
       </listitem>
 
index 78ae437..10cae6e 100644 (file)
 
       <listitem>
         <para>
-          <link linkend="SQRT_block">SQRT - SQRT Square root</link>
+          <link linkend="SQRT">SQRT - SQRT Square root</link>
         </para>
       </listitem>