diff --git a/src/salloc/opt.c b/src/salloc/opt.c
index 7715e2537cfc7d9ca7019e11dd0fad69ab87042e..90418356e3ff5a0fd39edfbb864ba893c33eb79c 100644
--- a/src/salloc/opt.c
+++ b/src/salloc/opt.c
@@ -1519,7 +1519,8 @@ static void _help(void)
" --comment=name arbitrary comment\n"
" -L, --licenses=names required license, comma separated\n"
" --mail-type=type notify on state change: BEGIN, END, FAIL or ALL\n"
-" --mail-user=user who to send email notification for job state changes\n"
+" --mail-user=user who to send email notification for job state\n"
+" changes\n"
" --bell ring the terminal bell when the job is allocated\n"
" --no-bell do NOT ring the terminal bell\n"
" --gid=group_id group ID to run job as (user root only)\n"
@@ -1574,23 +1575,27 @@ static void _help(void)
printf("\n"
#ifdef HAVE_AIX /* AIX/Federation specific options */
- "AIX related options:\n"
- " --network=type communication protocol to be used\n"
- "\n"
+"AIX related options:\n"
+" --network=type communication protocol to be used\n"
+"\n"
#endif
#ifdef HAVE_BG /* Blue gene specific options */
"\n"
- "Blue Gene related options:\n"
- " -g, --geometry=XxYxZ geometry constraints of the job\n"
- " -R, --no-rotate disable geometry rotation\n"
- " --reboot reboot nodes before starting job\n"
- " --conn-type=type constraint on type of connection, MESH or TORUS\n"
- " if not set, then tries to fit TORUS else MESH\n"
- " --blrts-image=path path to blrts image for bluegene block. Default if not set\n"
- " --linux-image=path path to linux image for bluegene block. Default if not set\n"
- " --mloader-image=path path to mloader image for bluegene block. Default if not set\n"
- " --ramdisk-image=path path to ramdisk image for bluegene block. Default if not set\n"
- "\n"
+"Blue Gene related options:\n"
+" -g, --geometry=XxYxZ geometry constraints of the job\n"
+" -R, --no-rotate disable geometry rotation\n"
+" --reboot reboot nodes before starting job\n"
+" --conn-type=type constraint on type of connection, MESH or TORUS\n"
+" if not set, then tries to fit TORUS else MESH\n"
+" --blrts-image=path path to blrts image for bluegene block.\n"
+" Default if not set\n"
+" --linux-image=path path to linux image for bluegene block. Default\n"
+" if not set\n"
+" --mloader-image=path path to mloader image for bluegene block.\n"
+" Default if not set\n"
+" --ramdisk-image=path path to ramdisk image for bluegene block.\n"
+" Default if not set\n"
+"\n"
#endif
"Help options:\n"
" -h, --help show this help message\n"
diff --git a/src/sbatch/opt.c b/src/sbatch/opt.c
index 70a441e3a0942f0a96786ddecfb5b3e40833ded8..d8685357d899daccda8251aa73aba2980f40d40f 100644
--- a/src/sbatch/opt.c
+++ b/src/sbatch/opt.c
@@ -2299,7 +2299,8 @@ static void _help(void)
" --comment=name arbitrary comment\n"
" -L, --licenses=names required license, comma separated\n"
" --mail-type=type notify on state change: BEGIN, END, FAIL or ALL\n"
-" --mail-user=user who to send email notification for job state changes\n"
+" --mail-user=user who to send email notification for job state\n"
+" changes\n"
" --gid=group_id group ID to run job as (user root only)\n"
" --uid=user_id user ID to run job as (user root only)\n"
" --get-user-env used by Moab. See srun man page.\n"
@@ -2371,10 +2372,14 @@ static void _help(void)
" SMP (default), HTC_D for Dual, HTC_V for\n"
" virtual node mode, and HTC_L for Linux mode.\n"
#endif
-" --blrts-image=path path to blrts image for bluegene block. Default if not set\n"
-" --linux-image=path path to linux image for bluegene block. Default if not set\n"
-" --mloader-image=path path to mloader image for bluegene block. Default if not set\n"
-" --ramdisk-image=path path to ramdisk image for bluegene block. Default if not set\n"
+" --blrts-image=path path to blrts image for bluegene block. Default\n"
+" if not set\n"
+" --linux-image=path path to linux image for bluegene block. Default\n"
+" if not set\n"
+" --mloader-image=path path to mloader image for bluegene block.\n"
+" Default if not set\n"
+" --ramdisk-image=path path to ramdisk image for bluegene block.\n"
+" Default if not set\n"
#endif
"\n"
"Help options:\n"
diff --git a/src/smap/opts.c b/src/smap/opts.c
index 246ec24f8232de844ba6a76880e5be82879b9ad9..37da3c66084705d1a12a7544a05f605a5211886f 100644
--- a/src/smap/opts.c
+++ b/src/smap/opts.c
@@ -163,20 +163,20 @@ static void _help(void)
{
printf("\
Usage: smap [OPTIONS]\n\
- -D, --display set which Display mode to use\n\
- j=jobs\n\
- s=slurm partitions\n\
- b=Bluegene blocks\n\
- c=set configuration\n\
+ -D, --display set which display mode to use\n\
+ j=jobs\n\
+ s=slurm partitions\n\
+ b=bluegene blocks\n\
+ c=set configuration\n\
-h, --noheader no headers on output\n\
-i, --iterate=seconds specify an interation period\n\
-V, --version output version information and exit\n\
- -c, --commandline output written with straight to the \
-commandline.\n\
- -p, --parse used with -c to not format output, but use \
-single tab delimitation.\n\
- -R, --resolve resolve an XYZ coord from a Rack/Midplane id \
-or vice versa.\n\
+ -c, --commandline output written with straight to the\n\
+ commandline.\n\
+ -p, --parse used with -c to not format output, but use\n\
+ single tab delimitation.\n\
+ -R, --resolve resolve an XYZ coord from a Rack/Midplane id \n\
+ or vice versa.\n\
(i.e. -R R101 for R/M input -R 101 for XYZ).\n\
\nHelp options:\n\
--help show this help message\n\
diff --git a/src/srun/opt.c b/src/srun/opt.c
index 8cded87069a4ce38d622c8848f1b578e58b79f20..d9f5b312a91b989c5a4270f0b4e6fcea88d1bb62 100644
--- a/src/srun/opt.c
+++ b/src/srun/opt.c
@@ -698,6 +698,7 @@ static void set_options(const int argc, char **argv)
{"chdir", required_argument, 0, 'D'},
{"error", required_argument, 0, 'e'},
{"preserve-env", no_argument, 0, 'E'},
+ {"preserve-slurm-env", no_argument, 0, 'E'},
{"geometry", required_argument, 0, 'g'},
{"hold", no_argument, 0, 'H'},
{"input", required_argument, 0, 'i'},
@@ -2058,15 +2059,18 @@ static void _help(void)
" --task-epilog=program run \"program\" after launching task\n"
" --begin=time defer job until HH:MM DD/MM/YY\n"
" --mail-type=type notify on state change: BEGIN, END, FAIL or ALL\n"
-" --mail-user=user who to send email notification for job state changes\n"
+" --mail-user=user who to send email notification for job state\n" " changes\n"
" --multi-prog if set the program name specified is the\n"
" configuration specification for multiple programs\n"
" --get-user-env used by Moab. See srun man page.\n"
" -L, --licenses=names required license, comma separated\n"
" --checkpoint=time job step checkpoint interval\n"
-" --checkpoint-dir=dir directory to store job step checkpoint image files\n"
-" --restart-dir=dir directory of checkpoint image files to restart from\n"
-" -E, --preserve-env env vars for node and task counts override command-line flags\n"
+" --checkpoint-dir=dir directory to store job step checkpoint image \n"
+" files\n"
+" --restart-dir=dir directory of checkpoint image files to restart "
+" from\n"
+" -E, --preserve-env env vars for node and task counts override "
+" command-line flags\n"
#ifdef HAVE_PTY_H
" --pty run task zero in pseudo terminal\n"
#endif
@@ -2122,32 +2126,36 @@ static void _help(void)
printf("\n"
#ifdef HAVE_AIX /* AIX/Federation specific options */
- "AIX related options:\n"
- " --network=type communication protocol to be used\n"
- "\n"
+"AIX related options:\n"
+" --network=type communication protocol to be used\n"
+"\n"
#endif
#ifdef HAVE_BG /* Blue gene specific options */
- "Blue Gene related options:\n"
- " -g, --geometry=XxYxZ geometry constraints of the job\n"
- " -R, --no-rotate disable geometry rotation\n"
- " --reboot reboot block before starting job\n"
- " --conn-type=type constraint on type of connection, MESH or TORUS\n"
- " if not set, then tries to fit TORUS else MESH\n"
- " --blrts-image=path path to blrts image for bluegene block. Default if not set\n"
- " --linux-image=path path to linux image for bluegene block. Default if not set\n"
- " --mloader-image=path path to mloader image for bluegene block. Default if not set\n"
- " --ramdisk-image=path path to ramdisk image for bluegene block. Default if not set\n"
- "\n"
+"Blue Gene related options:\n"
+" -g, --geometry=XxYxZ geometry constraints of the job\n"
+" -R, --no-rotate disable geometry rotation\n"
+" --reboot reboot block before starting job\n"
+" --conn-type=type constraint on type of connection, MESH or TORUS\n"
+" if not set, then tries to fit TORUS else MESH\n"
+" --blrts-image=path path to blrts image for bluegene block. Default\n"
+" if not set\n"
+" --linux-image=path path to linux image for bluegene block. Default\n"
+" if not set\n"
+" --mloader-image=path path to mloader image for bluegene block.\n"
+" Default if not set\n"
+" --ramdisk-image=path path to ramdisk image for bluegene block.\n"
+" Default if not set\n"
+"\n"
#endif
- "Help options:\n"
- " --help show this help message\n"
- " --usage display brief usage message\n"
- " --print-request Display job's layout without scheduling it\n"
- "\n"
- "Other options:\n"
- " -V, --version output version information and exit\n"
- "\n"
+"Help options:\n"
+" --help show this help message\n"
+" --usage display brief usage message\n"
+" --print-request Display job's layout without scheduling it\n"
+"\n"
+"Other options:\n"
+" -V, --version output version information and exit\n"
+"\n"
);
}
diff --git a/src/strigger/opts.c b/src/strigger/opts.c
index eb04cec1113c4f5db845ebe02f927daab3887b8e..4b4ec563350e8006d88badbc210ce9b606994db7 100644
--- a/src/strigger/opts.c
+++ b/src/strigger/opts.c
@@ -368,7 +368,8 @@ Usage: strigger [--set | --get | --clear] [OPTIONS]\n\
-p, --program=path pathname of program to execute when triggered\n\
-r, --reconfig trigger event on configuration changes\n\
-t, --time trigger event on job's time limit\n\
- -u, --up trigger event when node returned to service from DOWN state\n\
+ -u, --up trigger event when node returned to service from DOWN \n\
+ state\n\
--user a user name or ID to filter triggers by\n\
-v, --verbose print detailed event logging\n\
-V, --version print version information and exit\n\