svn merge -r20638:20642 https://eris.llnl.gov/svn/slurm/branches/slurm-2.1

doc/man/man1/srun.1

@@ -951,7 +951,7 @@ with the \fB\-\-relative\fR option, a warning message will be
 printed and the \fB\-\-relative\fR option will take precedence.
 
 .TP
-\fB\-\-resv-ports\fR
+\fB\-\-resv\-ports\fR
 Reserve communication ports for this job.
 Used for OpenMPI.
 
@@ -1463,6 +1463,9 @@ Same as \fB\-l, \-\-label\fR
 \fBSLURM_MEM_BIND\fR
 Same as \fB\-\-mem_bind\fR
 .TP
+\fBSLURM_MPI_TYPE\fR
+Same as \fB\-\-mpi\fR
+.TP
 \fBSLURM_NETWORK\fR
 Same as \fB\-\-network\fR
 .TP
@@ -1505,6 +1508,9 @@ Same as \fB\-D, \-\-chdir=\fR
 \fBSLURM_RESTART_DIR\fR
 Same as \fB\-\-restart\-dir\fR
 .TP
+\fBSLURM_RESV_PORTS\fR
+Same as \fB\-\-resv\-ports\fR
+.TP
 \fBSLURM_SIGNAL\fR
 Same as \fB\-\-signal\fR
 .TP