diff --git a/doc/man/man1/srun.1 b/doc/man/man1/srun.1
index 4cf5d961860bc2076d72b1abde475606e62118bc..129fbc180b2e4e784d389f9d10e1d957b3816ebc 100644
--- a/doc/man/man1/srun.1
+++ b/doc/man/man1/srun.1
@@ -235,11 +235,12 @@ The slurmd debug information is copied onto the stderr of
 the job. By default only errors are displayed. 
 .TP
 \fB\-W\fR, \fB\-\-wait\fR=\fIseconds\fR
-Specify how long to wait after the first task terminates before terminating 
-all remaining tasks. A value of zero indicates an unlimited wait. 
-The default value is unlimited. This can be useful to 
-insure that a job is terminated in a timely fashion in the event that one 
-or more tasks terminate prematurely.
+Specify how long to wait after the first task terminates before terminating
+all remaining tasks. A value of 0 indicates an unlimited wait (a warning will
+be issued after 60 seconds). The default value is set by the WaitTime
+parameter in the slurm configuration file (see \fBslurm.conf(5)\fR). This
+option can be useful to insure that a job is terminated in a timely fashion
+in the event that one or more tasks terminate prematurely.
 .TP
 \fB\-q\fR, \fB\-\-quit-on-interrupt\fR
 Quit immediately on single SIGINT (Ctrl-C). Use of this option