From d5a28a1d808cc398efb75f482b7ca6e64e9fec60 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Fri, 15 Oct 2010 15:13:26 +0000
Subject: [PATCH] Update OpenMPI info based upon input from Beat Rubischon

---
 doc/html/mpi_guide.shtml | 12 +++++-------
 doc/html/team.shtml      |  3 ++-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/doc/html/mpi_guide.shtml b/doc/html/mpi_guide.shtml
index e28daf4f6d8..011d824166c 100644
--- a/doc/html/mpi_guide.shtml
+++ b/doc/html/mpi_guide.shtml
@@ -51,8 +51,8 @@ with SLURM are provided below.
 
 <p>The current versions of SLURM and Open MPI support task launch using the
 <span class="commandline">srun</span> command.
-It relies upon SLURM version 2.0 (or higher) managing
-reservations of communication ports for the Open MPI's use.
+It relies upon SLURM version 2.0 (or higher) managing reservations of
+communication ports for use by the Open MPI version 1.5 (or higher).
 The system administrator must specify the range of ports to be reserved
 in the <i>slurm.conf</i> file using the <i>MpiParams</i> parameter.
 For example: <br>
@@ -76,15 +76,13 @@ ports.</p>
 <h2>Older releases</h2>
 <p>Older versions of Open MPI and SLURM rely upon SLURM to allocate resources
 for the job and then mpirun to initiate the tasks.
-When using SLURM's <span class="commandline">salloc</span> command,
-<span class="commandline">mpirun</span>'s -nolocal option is recommended.
 For example:
 <pre>
 $ salloc -n4 sh    # allocates 4 processors
                    # and spawns shell for job
-&gt; mpirun -np 4 -nolocal a.out
+&gt; mpirun a.out
 &gt; exit             # exits shell spawned by
-                   # initial srun command
+                   # initial salloc command
 </pre></p>
 
 <hr size=4 width="100%">
@@ -316,6 +314,6 @@ sbatch: Submitted batch job 1234
 tasks. These tasks are not managed by SLURM since they are launched
 outside of its control.</p>
 
-<p style="text-align:center;">Last modified 2 July 2010</p>
+<p style="text-align:center;">Last modified 15 October 2010</p>
 
 <!--#include virtual="footer.txt"-->
diff --git a/doc/html/team.shtml b/doc/html/team.shtml
index 3f34e1a5e47..f1ced0d8125 100644
--- a/doc/html/team.shtml
+++ b/doc/html/team.shtml
@@ -75,6 +75,7 @@ Linux NetworX and many other contributors.
 <li>Andy Riebs (HP)</li>
 <li>Asier Roa (Barcelona Supercomputer Center, Spain)</li>
 <li>Miguel Ros (Barcelona Supercomputer Center, Spain)</li>
+<li>Beat Rubischon (DALCO AG, Switzerland)</li>
 <li>Dan Rusak (Bull)</li>
 <li>Eygene Ryabinkin (Kurchatov Institute, Russia)</li>
 <li>Federico Sacerdoti (D.E. Shaw)</li>
@@ -90,6 +91,6 @@ Linux NetworX and many other contributors.
 <li>Anne-Marie Wunderlin (Bull)</li>
 </ul>
 
-<p style="text-align:center;">Last modified 29 September 2010</p>
+<p style="text-align:center;">Last modified 15 October 2010</p>
 
 <!--#include virtual="footer.txt"-->
-- 
GitLab