From 11771c54c63e78081b81bf1b5e653adc06a27f02 Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Thu, 19 Nov 2015 08:19:16 -0800
Subject: [PATCH] Explain job limit parameters better

---
 doc/man/man5/slurm.conf.5 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/man/man5/slurm.conf.5 b/doc/man/man5/slurm.conf.5
index c37b0219f95..042d224fcc2 100644
--- a/doc/man/man5/slurm.conf.5
+++ b/doc/man/man5/slurm.conf.5
@@ -2091,6 +2091,11 @@ the default action is to propagate all limits.
 Only one of the parameters, either
 \fBPropagateResourceLimits\fR or \fBPropagateResourceLimitsExcept\fR,
 may be specified.
+The user limits can not exceed hard limits under which the slurmd daemon
+operates. If the user limits are not propagated, the limits from the slurmd
+daemon will be propagated to the user's job. The limits used for the Slurm
+daemons can be set in the /etc/sysconf/slurm file. For more information, see:
+http://slurm.schedmd.com/faq.html#memlock
 The following limit names are supported by Slurm (although some
 options may not be supported on some systems):
 .RS
-- 
GitLab