--- /app/slurm/rbs/slurm/src/salloc/opt.c	2012-03-15 09:25:32.000000000 -0700
+++ /app/slurm/rbs/slurm/src/salloc/opt-1.c	2012-03-15 09:22:57.000000000 -0700
@@ -1793,8 +1793,8 @@
 	     opt.mem_bind == NULL ? "default" : opt.mem_bind);
 	str = print_commandline(command_argc, command_argv);
 	info("user command   : `%s'", str);
-	info("switch         : %d", opt.req_switch);
-	info("wait-for-switch: %d", opt.wait4switch);
+	info("switches          : %d", opt.req_switch);
+	info("wait-for-switches : %d", opt.wait4switch);
 	xfree(str);
 
 }
@@ -1825,7 +1825,7 @@
 "              [--network=type] [--mem-per-cpu=MB] [--qos=qos]\n"
 "              [--cpu_bind=...] [--mem_bind=...] [--reservation=name]\n"
 "              [--time-min=minutes] [--gres=list]\n"
-"              [--switch=max-switches[@max-time-to-wait]]\n"
+"              [--switches=max-switches[@max-time-to-wait]]\n"
 "              [executable [args...]]\n");
 }
 
@@ -1873,7 +1873,7 @@
 "      --time-min=minutes      minimum time limit (if distinct)\n"
 "      --uid=user_id           user ID to run job as (user root only)\n"
 "  -v, --verbose               verbose mode (multiple -v's increase verbosity)\n"
-"      --switch=max-switches{@max-time-to-wait}\n"
+"      --switches=max-switches{@max-time-to-wait}\n"
 "                              Optimum switches and max time to wait for optimum\n"
 "\n"
 "Constraint options:\n"
--- /app/slurm/rbs/slurm/src/sbatch/opt.c	2012-03-15 09:26:29.000000000 -0700
+++ /app/slurm/rbs/slurm/src/sbatch/opt-1.c	2012-03-15 09:22:57.000000000 -0700
@@ -2774,8 +2774,8 @@
 	info("plane_size        : %u", opt.plane_size);
 	info("propagate         : %s",
 	     opt.propagate == NULL ? "NONE" : opt.propagate);
-	info("switch            : %d", opt.req_switch);
-	info("wait-for-switch   : %d", opt.wait4switch);
+	info("switches          : %d", opt.req_switch);
+	info("wait-for-switches : %d", opt.wait4switch);
 	str = print_commandline(opt.script_argc, opt.script_argv);
 	info("remote command    : `%s'", str);
 	xfree(str);
@@ -2809,7 +2809,7 @@
 "              [--nodefile=file] [--nodelist=hosts] [--exclude=hosts]\n"
 "              [--network=type] [--mem-per-cpu=MB] [--qos=qos] [--gres=list]\n"
 "              [--cpu_bind=...] [--mem_bind=...] [--reservation=name]\n"
-"              [--switch=max-switches{@max-time-to-wait}]\n"
+"              [--switches=max-switches{@max-time-to-wait}]\n"
 "              [--export[=names]] [--export-file=file|fd] executable [args...]\n");
 }
 
@@ -2866,7 +2866,7 @@
 "      --uid=user_id           user ID to run job as (user root only)\n"
 "  -v, --verbose               verbose mode (multiple -v's increase verbosity)\n"
 "      --wrap[=command string] wrap commmand string in a sh script and submit\n"
-"      --switch=max-switches{@max-time-to-wait}\n"
+"      --switches=max-switches{@max-time-to-wait}\n"
 "                              Optimum switches and max time to wait for optimum\n"
 "\n"
 "Constraint options:\n"
--- /app/slurm/rbs/slurm/src/srun/opt.c	2012-03-15 09:27:36.000000000 -0700
+++ /app/slurm/rbs/slurm/src/srun/opt-1.c	2012-03-15 09:22:57.000000000 -0700
@@ -2411,8 +2411,8 @@
 	info("job name       : `%s'", opt.job_name);
 	info("reservation    : `%s'", opt.reservation);
 	info("wckey          : `%s'", opt.wckey);
-	info("switch         : %d", opt.req_switch);
-	info("wait-for-switch: %d", opt.wait4switch);
+	info("switches       : %d", opt.req_switch);
+	info("wait-for-switches : %d", opt.wait4switch);
 	info("distribution   : %s", format_task_dist_states(opt.distribution));
 	if(opt.distribution == SLURM_DIST_PLANE)
 		info("plane size   : %u", opt.plane_size);
@@ -2565,7 +2565,7 @@
 "            [--prolog=fname] [--epilog=fname]\n"
 "            [--task-prolog=fname] [--task-epilog=fname]\n"
 "            [--ctrl-comm-ifhn=addr] [--multi-prog]\n"
-"            [--switch=max-switches{@max-time-to-wait}]\n"
+"            [--switches=max-switches{@max-time-to-wait}]\n"
 "            [-w hosts...] [-x hosts...] executable [args...]\n");
 }
 
@@ -2640,7 +2640,7 @@
 "  -W, --wait=sec              seconds to wait after first task exits\n"
 "                              before killing job\n"
 "  -X, --disable-status        Disable Ctrl-C status feature\n"
-"      --switch=max-switches{@max-time-to-wait}\n"
+"      --switches=max-switches{@max-time-to-wait}\n"
 "                              Optimum switches and max time to wait for optimum\n"
 "\n"
 "Constraint options:\n"