[doc] mv perms.xml in setoperations

  Merge of this transfer is required before improving the files contents.
  Thanks.

Change-Id: Ied4ddd58c3fe6ce61d62877b6ede0bc1d6342ce3

diff --git a/scilab/modules/elementary_functions/help/en_US/discrete/perms.xml b/scilab/modules/elementary_functions/help/en_US/setoperations/perms.xml
similarity index 96%
rename from scilab/modules/elementary_functions/help/en_US/discrete/perms.xml
rename to scilab/modules/elementary_functions/help/en_US/setoperations/perms.xml
index 5e364ed..8e27dbe 100644 (file)
--- a/scilab/modules/elementary_functions/help/en_US/discrete/perms.xml
+++ b/scilab/modules/elementary_functions/help/en_US/setoperations/perms.xml
@@ -16,7 +16,7 @@
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="perms" xml:lang="en">
     <refnamediv>
         <refname>perms</refname>
-        <refpurpose>all permutations of vector components</refpurpose>
+        <refpurpose>Set of all permutations of given components</refpurpose>
     </refnamediv>
     <refsynopsisdiv>
         <title>Syntax</title>

diff --git a/scilab/modules/elementary_functions/help/fr_FR/discrete/perms.xml b/scilab/modules/elementary_functions/help/fr_FR/setoperations/perms.xml
similarity index 94%
rename from scilab/modules/elementary_functions/help/fr_FR/discrete/perms.xml
rename to scilab/modules/elementary_functions/help/fr_FR/setoperations/perms.xml
index b7cee90..7b9cd20 100644 (file)
--- a/scilab/modules/elementary_functions/help/fr_FR/discrete/perms.xml
+++ b/scilab/modules/elementary_functions/help/fr_FR/setoperations/perms.xml
@@ -2,8 +2,8 @@
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="perms" xml:lang="fr">
     <refnamediv>
         <refname>perms</refname>
-        <refpurpose>retourne toutes les permutations des composantes d'un
-            vecteur
+        <refpurpose>
+                       Ensemble des permutations des éléments donnés
         </refpurpose>
     </refnamediv>
     <refsynopsisdiv>

diff --git a/scilab/modules/elementary_functions/help/ja_JP/discrete/perms.xml b/scilab/modules/elementary_functions/help/ja_JP/setoperations/perms.xml
similarity index 100%
rename from scilab/modules/elementary_functions/help/ja_JP/discrete/perms.xml
rename to scilab/modules/elementary_functions/help/ja_JP/setoperations/perms.xml

diff --git a/scilab/modules/elementary_functions/help/pt_BR/discrete/perms.xml b/scilab/modules/elementary_functions/help/pt_BR/setoperations/perms.xml
similarity index 95%
rename from scilab/modules/elementary_functions/help/pt_BR/discrete/perms.xml
rename to scilab/modules/elementary_functions/help/pt_BR/setoperations/perms.xml
index 3558d40..f87ab42 100644 (file)
--- a/scilab/modules/elementary_functions/help/pt_BR/discrete/perms.xml
+++ b/scilab/modules/elementary_functions/help/pt_BR/setoperations/perms.xml
@@ -16,8 +16,8 @@
 <refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="perms" xml:lang="pt">
     <refnamediv>
         <refname>perms</refname>
-        <refpurpose>retorna todas as permutações dos componentes de um
-            vetor
+        <refpurpose>
+            conjunto de todas as permutações de determinados componentes
         </refpurpose>
     </refnamediv>
     <refsynopsisdiv>

diff --git a/scilab/modules/elementary_functions/help/ru_RU/discrete/perms.xml b/scilab/modules/elementary_functions/help/ru_RU/setoperations/perms.xml
similarity index 100%
rename from scilab/modules/elementary_functions/help/ru_RU/discrete/perms.xml
rename to scilab/modules/elementary_functions/help/ru_RU/setoperations/perms.xml

diff --git a/scilab/modules/elementary_functions/macros/perms.sci b/scilab/modules/elementary_functions/macros/perms.sci
index e51520d..21b59d3 100644 (file)
--- a/scilab/modules/elementary_functions/macros/perms.sci
+++ b/scilab/modules/elementary_functions/macros/perms.sci
@@ -29,7 +29,7 @@ function y = perms(x)
     if size(x,"*")==1 | size(x,"*")==0 then
         y = x;
     elseif size(x,1)<>1 & size(x,2)<>1 then
-        error(msprintf(gettext("%s: Wrong size for input argument #%d: Vector expected.\n"),"perms"));
+        error(msprintf(gettext("%s: Wrong size for input argument #%d: Vector expected.\n"),"perms", 1));
     else
         xsize = size(x, "*");
         indrec = perms(1:xsize-1);