aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2018-04-10 10:28:48 +0200
committerGitHub <[email protected]>2018-04-10 10:28:48 +0200
commit6a38655668542cebb60d5e13078b599abb3f0ec6 (patch)
treed0a59dea1b77304b5900ed8fc105ec8acc4a859a /lib/kernel
parent4c29e451d8839fbfd3733444640a761c2c9b1f2a (diff)
parente5e2fd334b9fec2bedab9ee6987b96ca2aec1f87 (diff)
downloadotp-6a38655668542cebb60d5e13078b599abb3f0ec6.tar.gz
otp-6a38655668542cebb60d5e13078b599abb3f0ec6.tar.bz2
otp-6a38655668542cebb60d5e13078b599abb3f0ec6.zip
Merge pull request #1751 from fhunleth/heart-timeout
Remove note about heart rebooting on NTP updates
Diffstat (limited to 'lib/kernel')
-rw-r--r--lib/kernel/doc/src/heart.xml5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/kernel/doc/src/heart.xml b/lib/kernel/doc/src/heart.xml
index 5b5b71e521..46c7ce60b6 100644
--- a/lib/kernel/doc/src/heart.xml
+++ b/lib/kernel/doc/src/heart.xml
@@ -59,8 +59,9 @@
<pre>
% <input>erl -heart -env HEART_BEAT_TIMEOUT 30 ...</input></pre>
<p>The value (in seconds) must be in the range 10 &lt; X &lt;= 65535.</p>
- <p>Notice that if the system clock is adjusted with
- more than <c>HEART_BEAT_TIMEOUT</c> seconds, <c>heart</c>
+ <p>When running on OSs lacking support for monotonic time,
+ <c>heart</c> is susceptible to system clock adjustments of more than
+ <c>HEART_BEAT_TIMEOUT</c> seconds. When this happens, <c>heart</c>
times out and tries to reboot the system. This can occur, for
example, if the system clock is adjusted automatically by use of the
Network Time Protocol (NTP).</p>