Merge from V6_4_BR

diff --git a/doc/job.rst b/doc/job.rst
index 7a5013964da0e23143a7b3124f143d990bdcfc2b..8c424a6b06bf52288d0f0e704d8b47fbafa556ba 100644 (file)
--- a/doc/job.rst
+++ b/doc/job.rst
@@ -46,9 +46,7 @@ The first table below describes the attributes of a job.
                                           the job's *work directory*.
 **Output files**         No               A list of files or directories that have to be copied from the job's resource
                                           to the user computer into the *result directory*.
-**Work directory**       No               It's the directory on the job's resource where the job will be executed. If
-                                          the user does not provide a directory, a default directory will be created
-                                          into the resource with this path: **~/Batch/"current date"**.
+**Work directory**       Yes              It's the directory on the job's resource where the job will be executed.
 **Result directory**     Yes              It's the directory in the user computer where the job's results have to be 
                                           copied at the end of the job.
 ======================== ================ ==============================================================================
@@ -61,7 +59,7 @@ The second table below describes the attributes of computation requirements.
 **Maximum duration**     It's the maximum expected duration of the job. When a batch manager is used, this
                          time is interpreted as a **walltime** and not as a **cputime**.
 **Number of cpu**        It's the number of cpus/cores requested.
-**Memory**               It's the amount of memory per cpu/core expected.
+**Memory**               It's the amount of memory per node expected.
 ======================== ==============================================================================
 
 Job's states

diff --git a/doc/resource.rst b/doc/resource.rst
index a0cfaa35fbd0014ffccdcce5f51ee15892a98bc9..d38f0b7a13c3e206bb4aa058cc4403cad453b735 100644 (file)
--- a/doc/resource.rst
+++ b/doc/resource.rst
@@ -39,12 +39,12 @@ The description of each attribute is given in the table below.
 **username**               Yes              User name to use for creating connections.
 **batch**                  Yes              Type of batch system installed in the resource. Use *ssh* if
                                             the resource is a single computer.
-**iprotocol**              Yes              Internal protocol to use on a cluster (ssh or rsh).
+**iprotocol**              Yes              Internal protocol to use on a cluster (ssh, rsh or srun).
 **mpiImpl**                No               MPI implementation to use.
 
 **OS**                     No               It's the operating system name, e.g.: Linux, Windows.
 **nb_node**                No               It's the amount of node of the computer.
-**nb_proc_per_node**       No               It's the amount or processor or core of your computer.
+**nb_proc_per_node**       No               It's the amount or processor or core in each node.
 **mem_mb**                 No               It's the amount of memory in megabytes per node.
 **cpu_clock**              No               It's the frequency in gigahertz of the computer's processors.
 ========================== ================ =============================================================