Merge branch 'fix-nodefiles' into 'master'

Fix generated nodefiles description.

See merge request !132

docs.it4i/anselm/software/intel-xeon-phi.md

@@ -883,18 +883,21 @@ A possible output of the MPI "hello-world" example executed on two hosts and two
 !!! note
     At this point the MPI communication between MIC accelerators on different nodes uses 1Gb Ethernet only.
 
-### Using the PBS Automatically Generated Node-Files
+### Using Automatically Generated Node-Files
 
-PBS also generates a set of node-files that can be used instead of manually creating a new one every time. Three node-files are genereated:
+Set of node-files, that can be used instead of manually creating a new one every time, is generated for user convenience. Six node-files are generated:
 
 !!! note
-    **Host only node-file:**
+    **Node-files:**
 
-     - /lscratch/${PBS_JOBID}/nodefile-cn MIC only node-file:
-     - /lscratch/${PBS_JOBID}/nodefile-mic Host and MIC node-file:
-     - /lscratch/${PBS_JOBID}/nodefile-mix
+     - /lscratch/${PBS_JOBID}/nodefile-cn Hosts only node-file
+     - /lscratch/${PBS_JOBID}/nodefile-mic MICs only node-file
+     - /lscratch/${PBS_JOBID}/nodefile-mix Hosts and MICs node-file
+     - /lscratch/${PBS_JOBID}/nodefile-cn-sn Hosts only node-file, using short names
+     - /lscratch/${PBS_JOBID}/nodefile-mic-sn MICs only node-file, using short names
+     - /lscratch/${PBS_JOBID}/nodefile-mix-sn Hosts and MICs node-file, using short names
 
-Each host or accelerator is listed only per files. User has to specify how many jobs should be executed per node using `-n` parameter of the mpirun command.
+Each host or accelerator is listed only once per file. User has to specify how many jobs should be executed per node using `-n` parameter of the mpirun command.
 
 ## Optimization
 

docs.it4i/salomon/software/intel-xeon-phi.md

@@ -990,18 +990,21 @@ Hello world from process 7 of 8 on host r38u32n1001-mic0
 !!! note
     At this point the MPI communication between MIC accelerators on different nodes uses 1Gb Ethernet only.
 
-#### Using the PBS Automatically Generated Node-Files
+### Using Automatically Generated Node-Files
 
-PBS also generates a set of node-files that can be used instead of manually creating a new one every time. Three node-files are genereated:
+Set of node-files, that can be used instead of manually creating a new one every time, is generated for user convenience. Six node-files are generated:
 
 !!! note
-    **Host only node-file:**
+    **Node-files:**
 
-     - /lscratch/${PBS_JOBID}/nodefile-cn MIC only node-file:
-     - /lscratch/${PBS_JOBID}/nodefile-mic Host and MIC node-file:
-     - /lscratch/${PBS_JOBID}/nodefile-mix
+     - /lscratch/${PBS_JOBID}/nodefile-cn Hosts only node-file
+     - /lscratch/${PBS_JOBID}/nodefile-mic MICs only node-file
+     - /lscratch/${PBS_JOBID}/nodefile-mix Hosts and MICs node-file
+     - /lscratch/${PBS_JOBID}/nodefile-cn-sn Hosts only node-file, using short names
+     - /lscratch/${PBS_JOBID}/nodefile-mic-sn MICs only node-file, using short names
+     - /lscratch/${PBS_JOBID}/nodefile-mix-sn Hosts and MICs node-file, using short names
 
-Each host or accelerator is listed only per files. User has to specify how many jobs should be executed per node using "-n" parameter of the mpirun command.
+Each host or accelerator is listed only once per file. User has to specify how many jobs should be executed per node using `-n` parameter of the mpirun command.
 
 ## Optimization