From 6be86d0487bf5561e04a5517c06c7e23b9c496fd Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Mon, 11 Dec 2006 16:44:59 +0000
Subject: [PATCH] svn merge -r 10425:10429
 https://eris.llnl.gov/svn/slurm/branches/slurm-1.1

---
 doc/man/man1/scontrol.1 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/man/man1/scontrol.1 b/doc/man/man1/scontrol.1
index 6b8a94edd54..70bf6038efb 100644
--- a/doc/man/man1/scontrol.1
+++ b/doc/man/man1/scontrol.1
@@ -107,6 +107,7 @@ they are responding.
 .TP
 \fIquiet\fP
 Print no warning or informational messages, only fatal error messages.
+This is an independent command with no options meant for use in interactive mode.
 .TP
 \fIquit\fP
 Terminate the execution of scontrol.
@@ -171,8 +172,9 @@ the Slurm configuration file and executing the \fIreconfigure\fP command
 (described above).
 .TP
 \fIverbose\fP
-Print detailed event logging. This includes time\-stamps on data structures, 
-record counts, etc.
+Print detailed event logging. 
+This includes time\-stamps on data structures, record counts, etc.
+This is an independent command with no options meant for use in interactive mode.
 .TP
 \fIversion\fP
 Display the version number of scontrol being executed.
-- 
GitLab