Update doc

diff --git a/doc/images/jobmanager_resource_2.png b/doc/images/jobmanager_resource_2.png
index 58bffc29edefc512a6fb9f8922e76e56cf540776..fb1a1d44adbafbbe7ef64b758913d71bb87d8c04 100644 (file)
Binary files a/doc/images/jobmanager_resource_2.png and b/doc/images/jobmanager_resource_2.png differ

diff --git a/doc/resource.rst b/doc/resource.rst
index 47a420dbb116f918bfa1db94a10dd63471ca2bbe..30f5aa1610ca76948fbe6e03f9c79d5e3d0c0970 100644 (file)
--- a/doc/resource.rst
+++ b/doc/resource.rst
@@ -73,8 +73,11 @@ The description of each attribute is given in the table below.
 **mem_mb**                 No               Memory per node in megabytes (not used by JOBMANAGER)
 **cpu_clock**              No               Clock rate in gigahertz of the computer's processor(s) (not
                                             used by JOBMANAGER)
-**Is Cluster Head**        Yes              Indicate if the resource is a cluster managed by a batch
-                                            manager
+**Can launch batch jobs**  Yes              Indicate if the resource can be used to launch batch jobs
+                                            (mandatory to use the resource with JOBMANAGER)
+**Can run containers**     No               Indicate if the resource can be used to run containers
+                                            interactively (from a YACS schema running on the local
+                                            machine for instance)
 **Working Directory**      No               Base working directory for the resource. The working
                                             directories for the jobs will by default be created as
                                             subdirectories of this directory.
@@ -107,7 +110,8 @@ in three different locations:
 3. If not, in the directory of the installation of SALOME KERNEL: 
    $KERNEL_ROOT_DIR/share/salome/resources/kernel/CatalogResources.xml.
 
-By default, the resource manager creates a resource with the name and the hostname of the user computer.
+By default, the resource manager creates a resource named "localhost" with the hostname
+of the local computer.
 
 JOBMANAGER resource management GUI
 ++++++++++++++++++++++++++++++++++
@@ -165,7 +169,7 @@ To launch a **command** job you need to fill the following attributes:
 - **protocol** = *ssh*
 - **username**
 - **Batch Manager** = *None*
-- **Is Cluster Head** = *false*
+- **Can launch batch jobs** = *yes*
 
 **Warning:** You have to configure ssh for allowing ssh commands without asking 
 interactive password (RSA or DSA keys).
@@ -187,7 +191,7 @@ To launch a **command** job you need to fill the following attributes:
 - **Batch Manager**
 - **iprotocol**
 - **nb_proc_per_node** (only with PBS batch manager)
-- **Is Cluster Head** = *true*
+- **Can launch batch jobs** = *yes*
 
 **Warning:** You have to configure ssh for allowing ssh commands without asking 
 interactive password (RSA or DSA keys) between your computer and the cluster and