--- lamrun.1-orig	2007-01-03 16:42:09.000000000 -0500
+++ lamrun.1	2007-01-03 16:48:09.000000000 -0500
@@ -1,55 +1,37 @@
 .TH MPIRUN 1 "March, 2006" "LAM 7.1.2" "LAM COMMANDS"
 .SH NAME
 mpirun \- Run MPI programs on LAM nodes.
-.SH SYNTAX
+.SH SYNOPSIS
 .hy 0
 .HP
 .na
 mpirun 
 [-fhvO] 
-[-c <#> | -np <#>] 
-[-D | -wd <dir>]
+[-c nn | -np nn] 
+[-D | -wd dir]
 [-ger | -nger] 
 [-sigs | -nsigs] 
-[-ssi <key> <value>]
+[-ssi key value]
 [-nw | -w] 
 [-nx]
 [-pty | -npty]
-[-s <node>] 
+[-s node] 
 [-t | -toff | -ton]
 [-tv] 
-[-x VAR1[=VALUE1][,VAR2[=VALUE2],...]]
-[[-p <prefix_str>] [-sa | -sf]]
-[<where>] 
-<program> [-- <args>]
-.PP
-.HP
+[-x settings]
+[[-p prefix_str] [-sa | -sf]]
+[where] 
+{program> [-- <args>] | schema }
+
+.SH OPTION USAGE
 .B Note: 
 Although each are individually optional, at least one of
-.IR <where> , 
+.IR where , 
 .IR -np ,
 or
 .I -c
-must be specified in the above form (i.e., when a schema is not used).
-.PP
-.HP
-mpirun 
-[-fhvO] 
-[-D | -wd <dir>]
-[-ger | -nger] 
-[-sigs | -nsigs] 
-[-ssi <key> <value>]
-[-nw | -w] 
-[-nx]
-[-pty | -npty]
-[-t | -toff | -ton] 
-[-tv]
-[-x VAR1[=VALUE1][,VAR2[=VALUE2],...]]
-<schema>
-.br
+must be specified when a schema is not used.
 .PP
-.HP
-.B Note:
 The
 .I -c2c
 and
@@ -57,7 +39,6 @@
 options are now obsolete.  Use 
 .I -ssi
 instead.  See the "SSI" section, below.
-.RE
 .ad b
 .hy 1
 .SH QUICK SUMMARY
@@ -178,7 +159,7 @@
 exclusive with 
 .IR \-nsigs .
 .TP
-.B -ssi <key> <value>
+.B -ssi key value
 Send arguments to various SSI modules.  See the "SSI" section, below.
 .TP
 .B -t, -ton
@@ -210,8 +191,8 @@
 .IR mpirun
 exits.
 .TP 
-.B -wd <dir>
-Change to the directory <dir> before the user's program executes.
+.BI -wd dir
+Change to the directory \fIdir\fR before the user's program executes.
 Note that if the 
 .I -wd 
 option appears both on the command line and in an application schema,
@@ -220,6 +201,7 @@
 .IR \-D .
 .TP 
 .B -x
+Takes as its argument a comma-separated list of settings in the form VAR=VALUE.
 Export the specified environment variables to the remote nodes before
 executing the program.  Existing environment variables can be
 specified (see the Examples section, below), or new variable names
@@ -679,17 +661,17 @@
 The 
 .I -ssi
 switch takes two arguments:
-.I <key>
+.I key
 and 
-.IR <value> .
+.IR value .
 The
-.I <key>
+.I key
 argument generally specifies which SSI module will receive the value.
 For example, the
 .I <key>
 "rpi" is used to select which RPI to be used for transporting MPI
 messages.  The
-.I <value> 
+.I value 
 argument is the value that is passed.  For example:
 .TP 4
 mpirun -ssi rpi lamd N foo