Fix mpi documentation to specify mpich-gm instead of mpichgm

doc/man/man1/srun.1

 \." $Id$
 .\"
-.TH SRUN "1" "June 2005" "srun 0.5" "slurm components"
+.TH SRUN "1" "August 2005" "srun 0.6" "slurm components"
 .SH "NAME"
 srun \- run parallel jobs
 .SH SYNOPSIS
@@ -184,15 +184,19 @@ procedures.
 .B list
 Lists avaliable mpi types to choose from.
 .TP
-.B mpich-gm
+.B lam
+Initiates one 'lamd' process per node and establishes necessary
+environment variables for LAM/MPI.
+.TP
+.B mpich\-gm
 For use with Myrinet.
 .TP
 .B mvapich
 For use with Infiniband.
 .TP
-.B lam
-Initiates one 'lamd' process per node and establishes necessary 
-environment variables for LAM/MPI.
+.B none
+No special MPI processing. This is the default and works with 
+many other versions of MPI.
 .RE
 .TP
 \fB\-\-jobid\fR=\fIid\fR

doc/man/man5/slurm.conf.5

@@ -218,11 +218,11 @@ its memory or other resources. The default value is 300 seconds.
 A value of zero prevents any job record purging.
 May not exceed 65534.
 .TP
-\fpMpiDefault\fR
+\fBMpiDefault\fR
 Identifies the default type of MPI to be used. 
 Srun may override this configuration parameter in any case.
-Currently supported versions include: lam, mpichgm, mvapich, 
-and none (default, which works for most other versions of MPI).
+Currently supported versions include: lam, mpich\-gm, mvapich, 
+and none (default, which works for many other versions of MPI).
 .TP
 \fBMpichGmDirectSupport\fR
 If set to "1", srun handles executable files linked with the MPICH-GM 

etc/slurm.conf.example

@@ -351,7 +351,7 @@ JobAcctType=jobacct/none
 #    "MpiDefault"	: define the default type of MPI to be used. If
 #			  srun does not specify another value, slurm will 
 #			  establish the environment for this mpi to execute.
-#			  Currently supported values are lam, mpichgm, mvapich,
+#			  Currently supported values are lam, mpich-gm, mvapich,
 #                         and none (default, which works for most other versions
 #                         of MPI).
 #

src/srun/opt.c

@@ -1573,6 +1573,7 @@ static void _help(void)
 "  -P, --dependency=jobid      defer job until specified jobid completes\n"
 "  -U, --account=name          charge job to specified account\n"
 "      --propagate[=rlimits]   propagate all [or specific list of] rlimits\n"
+"      --mpi=type              specifies version of MPI to use\n"
 "\n"
 "Allocate only:\n"
 "  -A, --allocate              allocate resources and spawn a shell\n"