svn merge -r 10425:10429 https://eris.llnl.gov/svn/slurm/branches/slurm-1.1

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.