diff --git a/doc/man/man1/salloc.1 b/doc/man/man1/salloc.1
index bc71f1d0f4e920a934f57c5061f01bd2997279ec..5ee3fb8c16d60a7a710a7e6f514a890522a252c2 100644
--- a/doc/man/man1/salloc.1
+++ b/doc/man/man1/salloc.1
@@ -1,4 +1,4 @@
-.TH salloc "1" "Slurm Commands" "February 2021" "Slurm Commands"
+.TH salloc "1" "Slurm Commands" "April 2021" "Slurm Commands"
 
 .SH "NAME"
 salloc \- Obtain a Slurm job allocation (a set of nodes), execute a command,
@@ -1339,9 +1339,8 @@ Request the maximum \fIntasks\fR be invoked on each core.
 Meant to be used with the \fB\-\-ntasks\fR option.
 Related to \fB\-\-ntasks\-per\-node\fR except at the core level
 instead of the node level.
-NOTE: This option is not supported unless \fISelectType=cons_res\fR is
-configured (either directly or indirectly on Cray systems)
-along with the node's core count.
+\fBNOTE\fR: This option is not supported when using
+\fISelectType=select/linear\fR.
 
 .TP
 \fB\-\-ntasks\-per\-gpu\fR=<\fIntasks\fR>
@@ -1386,9 +1385,8 @@ Request the maximum \fIntasks\fR be invoked on each socket.
 Meant to be used with the \fB\-\-ntasks\fR option.
 Related to \fB\-\-ntasks\-per\-node\fR except at the socket level
 instead of the node level.
-NOTE: This option is not supported unless \fISelectType=cons_res\fR is
-configured (either directly or indirectly on Cray systems)
-along with the node's socket count.
+\fBNOTE\fR: This option is not supported when using
+\fISelectType=select/linear\fR.
 
 .TP
 \fB\-\-no\-bell\fR
diff --git a/doc/man/man1/sbatch.1 b/doc/man/man1/sbatch.1
index 6bb68ba1f3969176059a0306c555c0cdf0ac4f32..45a42a0e28e8446f7c1c34e9b01acc46c00bcaa6 100644
--- a/doc/man/man1/sbatch.1
+++ b/doc/man/man1/sbatch.1
@@ -1458,9 +1458,8 @@ Request the maximum \fIntasks\fR be invoked on each core.
 Meant to be used with the \fB\-\-ntasks\fR option.
 Related to \fB\-\-ntasks\-per\-node\fR except at the core level
 instead of the node level.
-NOTE: This option is not supported unless \fISelectType=cons_res\fR is
-configured (either directly or indirectly on Cray systems)
-along with the node's core count.
+\fBNOTE\fR: This option is not supported when using
+\fISelectType=select/linear\fR.
 
 .TP
 \fB\-\-ntasks\-per\-gpu\fR=<\fIntasks\fR>
@@ -1505,9 +1504,8 @@ Request the maximum \fIntasks\fR be invoked on each socket.
 Meant to be used with the \fB\-\-ntasks\fR option.
 Related to \fB\-\-ntasks\-per\-node\fR except at the socket level
 instead of the node level.
-NOTE: This option is not supported unless \fISelectType=cons_res\fR is
-configured (either directly or indirectly on Cray systems)
-along with the node's socket count.
+\fBNOTE\fR: This option is not supported when using
+\fISelectType=select/linear\fR.
 
 .TP
 \fB\-O\fR, \fB\-\-overcommit\fR
diff --git a/doc/man/man1/srun.1 b/doc/man/man1/srun.1
index 127995343d164e91f53b559714f45e94addea664..2087adb903ab475ccdfca583fd50f3c8c49c81fa 100644
--- a/doc/man/man1/srun.1
+++ b/doc/man/man1/srun.1
@@ -1826,9 +1826,8 @@ Related to \fB\-\-ntasks\-per\-node\fR except at the core level
 instead of the node level.  Masks will automatically be generated
 to bind the tasks to specific cores unless \fB\-\-cpu\-bind=none\fR
 is specified.
-NOTE: This option is not supported unless \fISelectType=cons_res\fR is
-configured (either directly or indirectly on Cray systems)
-along with the node's core count.
+\fBNOTE\fR: This option is not supported when using
+\fISelectType=select/linear\fR.
 
 .TP
 \fB\-\-ntasks\-per\-gpu\fR=<\fIntasks\fR>
@@ -1877,9 +1876,8 @@ Related to \fB\-\-ntasks\-per\-node\fR except at the socket level
 instead of the node level.  Masks will automatically be generated
 to bind the tasks to specific sockets unless \fB\-\-cpu\-bind=none\fR
 is specified.
-NOTE: This option is not supported unless \fISelectType=cons_res\fR is
-configured (either directly or indirectly on Cray systems)
-along with the node's socket count.
+\fBNOTE\fR: This option is not supported when using
+\fISelectType=select/linear\fR.
 
 .TP
 \fB\-O\fR, \fB\-\-overcommit\fR