Revert f56158b2 "[doc] string pages improved" for specific files where

the term "text" was abusively used instead of "string".

Change-Id: I85d764fcd6250815acdef55bbcf7432c8a7a04e4

diff --git a/scilab/modules/string/help/en_US/justify.xml b/scilab/modules/string/help/en_US/justify.xml
index fcc4ad9..5412ea8 100644 (file)
--- a/scilab/modules/string/help/en_US/justify.xml
+++ b/scilab/modules/string/help/en_US/justify.xml
@@ -18,23 +18,23 @@
           xmlns:db="http://docbook.org/ns/docbook" xml:lang="en" xml:id="justify">
     <refnamediv>
         <refname>justify</refname>
-        <refpurpose>aligns texts in columns to the left, center, or right</refpurpose>
+        <refpurpose>aligns strings in columns to the left, center, or right</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>Tj = justify(T, position)</synopsis>
+        <synopsis>Tj = justify(S, position)</synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Arguments</title>
         <variablelist>
             <varlistentry>
-                <term>T</term>
+                <term>S</term>
                 <listitem>
                     <para>a matrix of character strings.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
-                <term>Tj</term>
+                <term>Sj</term>
                 <listitem>
                     <para>
                         a matrix of character strings. The justified result.

diff --git a/scilab/modules/string/help/en_US/length.xml b/scilab/modules/string/help/en_US/length.xml
index a44d405..7fcb8a0 100644 (file)
--- a/scilab/modules/string/help/en_US/length.xml
+++ b/scilab/modules/string/help/en_US/length.xml
@@ -19,7 +19,7 @@
           xml:id="length" xml:lang="en">
     <refnamediv>
         <refname>length</refname>
-        <refpurpose>Number of characters of a text. Number of elements of an array or list.</refpurpose>
+        <refpurpose>Number of characters of a string. Number of elements of an array or list.</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>

diff --git a/scilab/modules/string/help/en_US/prettyprint.xml b/scilab/modules/string/help/en_US/prettyprint.xml
index 9ca65e9..de80bbc 100644 (file)
--- a/scilab/modules/string/help/en_US/prettyprint.xml
+++ b/scilab/modules/string/help/en_US/prettyprint.xml
@@ -43,7 +43,7 @@
                         <itemizedlist>
                             <listitem>
                                 Supported types: booleans, encoded integers, real or complex numbers,
-                                polynomials and rationals with real or complex coefficients, texts,
+                                polynomials and rationals with real or complex coefficients, strings,
                                 cells, linear dynamical systems (as generated with syslin()),
                                 other Tlists.
                             </listitem>
@@ -467,7 +467,7 @@ winopen(File)  // Display the page in your browser
  ]]></programlisting>
     <para/>
     <para>
-        Please note that for text input, the protection needed for some special LaTeX characters
+        Please note that for string input, the protection needed for some special LaTeX characters
         is displayed as is by MathJax:
     </para>
     <inlinemediaobject>

diff --git a/scilab/modules/string/help/en_US/strcspn.xml b/scilab/modules/string/help/en_US/strcspn.xml
index 8e854d8..9686f8b 100644 (file)
--- a/scilab/modules/string/help/en_US/strcspn.xml
+++ b/scilab/modules/string/help/en_US/strcspn.xml
@@ -20,7 +20,7 @@
     <refnamediv>
         <refname>strcspn</refname>
         <refpurpose>
-            lengths from the beginning of texts until a character among those prohibited
+            lengths from the beginning of strings until a character among those prohibited
         </refpurpose>
     </refnamediv>
     <refsynopsisdiv>

diff --git a/scilab/modules/string/help/en_US/strncpy.xml b/scilab/modules/string/help/en_US/strncpy.xml
index c051220..2d2ab8c 100644 (file)
--- a/scilab/modules/string/help/en_US/strncpy.xml
+++ b/scilab/modules/string/help/en_US/strncpy.xml
@@ -18,7 +18,7 @@
           xmlns:scilab="http://www.scilab.org" xml:lang="en" xml:id="strncpy">
     <refnamediv>
         <refname>strncpy</refname>
-        <refpurpose>gets and gives the N first characters of the given texts</refpurpose>
+        <refpurpose>gets and gives the N first characters of the given strings</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>

diff --git a/scilab/modules/string/help/en_US/strrev.xml b/scilab/modules/string/help/en_US/strrev.xml
index 53b44d8..8756b3f 100644 (file)
--- a/scilab/modules/string/help/en_US/strrev.xml
+++ b/scilab/modules/string/help/en_US/strrev.xml
@@ -19,7 +19,7 @@
     <refnamediv>
         <refname>strrev</refname>
         <refpurpose>
-            Reverses the order of characters in the given texts
+            Reverses the order of characters in the given strings
         </refpurpose>
     </refnamediv>
     <refsynopsisdiv>

diff --git a/scilab/modules/string/help/en_US/strspn.xml b/scilab/modules/string/help/en_US/strspn.xml
index 3596050..ce9e711 100644 (file)
--- a/scilab/modules/string/help/en_US/strspn.xml
+++ b/scilab/modules/string/help/en_US/strspn.xml
@@ -20,23 +20,23 @@
     <refnamediv>
         <refname>strspn</refname>
         <refpurpose>
-            lengths of the beginning of texts as long as characters are among those allowed
+            lengths of the beginning of strings as long as characters are among those allowed
         </refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>headsLengths = strspn(Texts, allowedChars)</synopsis>
+        <synopsis>headsLengths = strspn(Strings, allowedChars)</synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Arguments</title>
         <variablelist>
             <varlistentry>
-                <term>Texts, allowedChars, headsLengths</term>
+                <term>Strings, allowedChars, headsLengths</term>
                 <listitem>
                     <para>
-                        Matrices of texts, of identical dimensions.
+                        Matrices of strings, of identical dimensions.
                         <varname>allowedChars</varname> can be a scalar string.
-                        It is then used for all <varname>Texts</varname> components.
+                        It is then used for all <varname>Strings</varname> components.
                     </para>
                 </listitem>
             </varlistentry>
@@ -45,8 +45,8 @@
     <refsection>
         <title>Description</title>
         <para>
-            <literal>headsLengths = strspn(Texts, allowedChars)</literal> returns the length of the initial
-            portion of <varname>Texts</varname> which consists only of characters that are part of
+            <literal>headsLengths = strspn(Strings, allowedChars)</literal> returns the length of the initial
+            portion of <varname>Strings</varname> which consists only of characters that are part of
             <varname>allowedChars</varname>.
         </para>
     </refsection>

diff --git a/scilab/modules/string/help/en_US/strstr.xml b/scilab/modules/string/help/en_US/strstr.xml
index 57a2587..5bb21bd 100644 (file)
--- a/scilab/modules/string/help/en_US/strstr.xml
+++ b/scilab/modules/string/help/en_US/strstr.xml
@@ -20,23 +20,23 @@
     <refnamediv>
         <refname>strstr</refname>
         <refpurpose>
-          Tail of a text starting from the 1st occurrrence of a given fragment
+          Tail of a string starting from the 1st occurrrence of a given fragment
         </refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
-        <synopsis>Tail = strstr(Text, StartingFragment)</synopsis>
+        <synopsis>Tail = strstr(Strings, StartingFragment)</synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Arguments</title>
         <variablelist>
             <varlistentry>
-                <term>Text, StartingFragment, Tail</term>
+                <term>Strings, StartingFragment, Tail</term>
                 <listitem>
                     <para>
-                        Matrices of texts, of identical dimensions.
-                       <varname>StartingFragments</varname> can be a single text. It is then used
-                       for all <varname>Texts</varname> components.
+                        Matrices of strings, of identical dimensions.
+                       <varname>StartingFragments</varname> can be a single string. It is then used
+                       for all <varname>Strings</varname> components.
                     </para>
                 </listitem>
             </varlistentry>
@@ -45,13 +45,13 @@
     <refsection>
         <title>Description</title>
         <para>
-            <literal>Tail = strstr(Text, StartingFragment)</literal> builds and returns a matrix
-            of texts such that, for each element <literal>Text(i)</literal>, <literal>Tail(i)</literal>
-            is the part of <literal>Text(i)</literal> starting from the first occurrence of
-            <literal>startingFragment(i)</literal>, up to the end of <literal>Text(i)</literal>.
+            <literal>Tail = strstr(Strings, StartingFragment)</literal> builds and returns a matrix
+            of strings such that, for each element <literal>Strings(i)</literal>, <literal>Tail(i)</literal>
+            is the part of <literal>Strings(i)</literal> starting from the first occurrence of
+            <literal>startingFragment(i)</literal>, up to the end of <literal>Strings(i)</literal>.
         </para>
         <para>
-            If <varname>StartingFragment(i)</varname> is not found in <literal>Text(i)</literal>,
+            If <varname>StartingFragment(i)</varname> is not found in <literal>Strings(i)</literal>,
             <literal>Tail(i)</literal> is set to <literal>""</literal>.
         </para>
     </refsection>

diff --git a/scilab/modules/string/help/en_US/strtod.xml b/scilab/modules/string/help/en_US/strtod.xml
index 61541d3..c90fe40 100644 (file)
--- a/scilab/modules/string/help/en_US/strtod.xml
+++ b/scilab/modules/string/help/en_US/strtod.xml
@@ -24,8 +24,8 @@
     <refsynopsisdiv>
         <title>Syntax</title>
         <synopsis>
-            [d, tails] = strtod(str)
-            [d, tails] = strtod(str, decimalseparator)
+            d =  strtod(str [,decimalseparator])
+            [d, tails] = strtod(str [,decimalseparator])
         </synopsis>
     </refsynopsisdiv>
     <refsection role="arguments">
@@ -35,7 +35,7 @@
                 <term>str</term>
                 <listitem>
                     <para>
-                        single component, vector, or matrix of text (strings).
+                        single component, vector, or matrix of strings.
                     </para>
                 </listitem>
             </varlistentry>

diff --git a/scilab/modules/string/help/en_US/tokens.xml b/scilab/modules/string/help/en_US/tokens.xml
index e8e56d8..001a149 100644 (file)
--- a/scilab/modules/string/help/en_US/tokens.xml
+++ b/scilab/modules/string/help/en_US/tokens.xml
@@ -19,23 +19,23 @@
     <refnamediv>
         <refname>tokens</refname>
         <refpurpose>
-            Splits a text using separators and gives its chunks
+            Splits a string using separators and gives its chunks
         </refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>
         <synopsis>
-            Chunks = tokens(text)
-            Chunks = tokens(text, separators)
+            Chunks = tokens(str)
+            Chunks = tokens(str, separators)
         </synopsis>
     </refsynopsisdiv>
     <refsection>
         <title>Arguments</title>
         <variablelist>
             <varlistentry>
-                <term>text</term>
+                <term>str</term>
                 <listitem>
-                    A single text to be split. It can include extended UTF-8 international characters.
+                    A single string to be split. It can include extended UTF-8 international characters.
                     <para/>
                 </listitem>
             </varlistentry>
@@ -50,7 +50,7 @@
             <varlistentry>
                 <term>Chunks</term>
                 <listitem>
-                    Column vector: Pieces of the split text.
+                    Column vector: Pieces of the split string.
                     <para/>
                 </listitem>
             </varlistentry>
@@ -59,7 +59,7 @@
     <refsection>
         <title>Description</title>
         <para>
-            <literal>tokens(…)</literal> searches the text for given separator(s),
+            <literal>tokens(…)</literal> searches the string for given separator(s),
             and splits it into chunks. Chunks are free of separators.
             Consecutive separators are merged.
         </para>

diff --git a/scilab/modules/string/help/fr_FR/strtod.xml b/scilab/modules/string/help/fr_FR/strtod.xml
index 9298049..04a90c7 100644 (file)
--- a/scilab/modules/string/help/fr_FR/strtod.xml
+++ b/scilab/modules/string/help/fr_FR/strtod.xml
@@ -19,13 +19,13 @@
           xmlns:scilab="http://www.scilab.org" xml:id="strtod" xml:lang="fr">
     <refnamediv>
         <refname>strtod</refname>
-        <refpurpose>convertit chaque nombre décimal littéral (texte) en sa valeur numérique</refpurpose>
+        <refpurpose>convertit chaque nombre décimal littéral (chaine de caractères) en sa valeur numérique</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntaxe</title>
         <synopsis>
-            [d, tails] = strtod(str)
-            [d, tails] = strtod(str, decimalseparator)
+            d =  strtod(str [,decimalseparator])
+            [d, tails] = strtod(str [,decimalseparator])
         </synopsis>
     </refsynopsisdiv>
     <refsection role="arguments">
@@ -35,7 +35,7 @@
                 <term>str</term>
                 <listitem>
                     <para>
-                        texte unique, ou vecteur ou matrice de textes.
+                        chaine de caractères, ou vecteur ou matrice de chaines de caractères.
                     </para>
                 </listitem>
             </varlistentry>
@@ -59,7 +59,7 @@
                 <term>tails</term>
                 <listitem>
                     <para>
-                        matrice texte de taille identique à celle de
+                        matrice de chaines de caractères identique à celle de
                         <varname>str</varname> : <literal>tails(i)</literal> est
                         la fin (éventuelle) de <literal>str(i)</literal> non prise
                         en compte pour établir <literal>d(i)</literal>, ou "" par