From 49a7acee729a1e970bf3e878a162cc4dca87c53e Mon Sep 17 00:00:00 2001
From: Don Lipari <lipari1@llnl.gov>
Date: Tue, 8 Dec 2009 19:34:38 +0000
Subject: [PATCH] -- Accompanies r19134: Added the "scontrol update
SlurmctldDebug" as the preferred alternative to the "scontrol setdebug"
command.
---
NEWS | 2 ++
doc/man/man1/salloc.1 | 2 +-
doc/man/man1/sbatch.1 | 2 +-
doc/man/man1/srun.1 | 2 +-
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/NEWS b/NEWS
index 3b14b2c7082..4ec5042e396 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ documents those changes that are of interest to users and admins.
* Changes in SLURM 2.1.0-pre9
=============================
+ -- Added the "scontrol update SlurmctldDebug" as the preferred alternative to
+ the "scontrol setdebug" command.
-- BLUEGENE - made it so when removing a block in an error state the nodes in
the block are set correctly in accounting as not in error.
-- Fixed issue where if slurmdbd is not up qos' are set up correctly for
diff --git a/doc/man/man1/salloc.1 b/doc/man/man1/salloc.1
index 8265109cf70..b6211f691a6 100644
--- a/doc/man/man1/salloc.1
+++ b/doc/man/man1/salloc.1
@@ -507,7 +507,7 @@ Mimimum memory required per allocated CPU in MegaBytes.
Default value is \fBDefMemPerCPU\fR and the maximum value is
\fBMaxMemPerCPU\fR. If configured, both of parameters can be
seen using the \fBscontrol show config\fR command.
-This parameter would generally be used of individual processors
+This parameter would generally be used if individual processors
are allocated to jobs (\fBSelectType=select/cons_res\fR).
Also see \fB\-\-mem\fR.
\fB\-\-mem\fR and \fB\-\-mem\-per\-cpu\fR are mutually exclusive.
diff --git a/doc/man/man1/sbatch.1 b/doc/man/man1/sbatch.1
index 5e0c856c189..227c902ae22 100644
--- a/doc/man/man1/sbatch.1
+++ b/doc/man/man1/sbatch.1
@@ -537,7 +537,7 @@ Mimimum memory required per allocated CPU in MegaBytes.
Default value is \fBDefMemPerCPU\fR and the maximum value is
\fBMaxMemPerCPU\fR. If configured, both of parameters can be
seen using the \fBscontrol show config\fR command.
-This parameter would generally be used of individual processors
+This parameter would generally be used if individual processors
are allocated to jobs (\fBSelectType=select/cons_res\fR).
Also see \fB\-\-mem\fR.
\fB\-\-mem\fR and \fB\-\-mem\-per\-cpu\fR are mutually exclusive.
diff --git a/doc/man/man1/srun.1 b/doc/man/man1/srun.1
index 1b2e9cc64f0..a231c4b47ae 100644
--- a/doc/man/man1/srun.1
+++ b/doc/man/man1/srun.1
@@ -553,7 +553,7 @@ Mimimum memory required per allocated CPU in MegaBytes.
Default value is \fBDefMemPerCPU\fR and the maximum value is
\fBMaxMemPerCPU\fR. If configured, both of parameters can be
seen using the \fBscontrol show config\fR command.
-This parameter would generally be used of individual processors
+This parameter would generally be used if individual processors
are allocated to jobs (\fBSelectType=select/cons_res\fR).
Also see \fB\-\-mem\fR.
\fB\-\-mem\fR and \fB\-\-mem\-per\-cpu\fR are mutually exclusive.
--
GitLab