diff --git a/doc/man/man1/salloc.1 b/doc/man/man1/salloc.1 index 5a6d28d661c7049cd81a4ec58950360ec50cff11..aa9a5c3387165ef71c7087a40c8b8f9210d33c54 100644 --- a/doc/man/man1/salloc.1 +++ b/doc/man/man1/salloc.1 @@ -1,4 +1,4 @@ -.TH salloc "1" "Slurm Commands" "December 2019" "Slurm Commands" +.TH salloc "1" "Slurm Commands" "January 2020" "Slurm Commands" .SH "NAME" salloc \- Obtain a Slurm job allocation (a set of nodes), execute a command, @@ -544,7 +544,6 @@ Example of use include "\-\-get\-user\-env", "\-\-get\-user\-env=10" "\-\-get\-user\-env=10L", and "\-\-get\-user\-env=S". NOTE: This option only works if the caller has an effective uid of "root". -This option was originally created for use by Moab. .TP \fB\-\-gid\fR=<\fIgroup\fR> diff --git a/doc/man/man1/sbatch.1 b/doc/man/man1/sbatch.1 index 7665a1e636c4117240c4fe5f2af3473bce3d90da..6479f3dd823e4ff79afd4f68d61c3ccc2502d733 100644 --- a/doc/man/man1/sbatch.1 +++ b/doc/man/man1/sbatch.1 @@ -1,4 +1,4 @@ -.TH sbatch "1" "Slurm Commands" "December 2019" "Slurm Commands" +.TH sbatch "1" "Slurm Commands" "January 2020" "Slurm Commands" .SH "NAME" sbatch \- Submit a batch script to Slurm. @@ -655,7 +655,6 @@ If \fImode\fR not specified, the mode established at Slurm build time is used. Example of use include "\-\-get\-user\-env", "\-\-get\-user\-env=10" "\-\-get\-user\-env=10L", and "\-\-get\-user\-env=S". -This option was originally created for use by Moab. .TP \fB\-\-gid\fR=<\fIgroup\fR> diff --git a/doc/man/man5/slurm.conf.5 b/doc/man/man5/slurm.conf.5 index 666114b3e926c3c42aa9a6342035d7035dfc0b86..a6c26527aae6543ee3d684664ba25fe8092ada93 100644 --- a/doc/man/man5/slurm.conf.5 +++ b/doc/man/man5/slurm.conf.5 @@ -1,4 +1,4 @@ -.TH "slurm.conf" "5" "Slurm Configuration File" "November 2019" "Slurm Configuration File" +.TH "slurm.conf" "5" "Slurm Configuration File" "January 2020" "Slurm Configuration File" .SH "NAME" slurm.conf \- Slurm configuration file @@ -374,8 +374,7 @@ The maximum time (in seconds) that a batch job is permitted for launching before being considered missing and releasing the allocation. The default value is 10 (seconds). Larger values may be required if more time is required to execute the \fBProlog\fR, load -user environment variables (for Moab spawned jobs), or if the slurmd -daemon gets paged from memory. +user environment variables, or if the slurmd daemon gets paged from memory. .br .br \fBNote\fR: The test for a job being successfully launched is only performed when @@ -867,11 +866,10 @@ Also see \fBMaxJobId\fR .TP \fBGetEnvTimeout\fR -Used for Moab scheduled jobs only. Controls how long job should wait -in seconds for loading the user's environment before attempting to -load it from a cache file. Applies when the srun or sbatch -\fI\-\-get\-user\-env\fR option is used. If set to 0 then always load -the user's environment from the cache file. +Controls how long the job should wait (in seconds) to load the user's +environment before attempting to load it from a cache file. +Applies when the salloc or sbatch \fI\-\-get\-user\-env\fR option is used. +If set to 0 then always load the user's environment from the cache file. The default value is 2 seconds. .TP