aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZandra Hird <[email protected]>2015-05-08 13:47:05 +0200
committerZandra Hird <[email protected]>2015-05-08 13:47:05 +0200
commit71b16c9b704374ea78de05943883befd49846a22 (patch)
tree154d40615cd00e5b4c77b693969e4978422d7b2c
parent48893d496c6efa9e7bc3340d451d18e8f80393c7 (diff)
parent0124b550307dbc2830669fb113860d90b33b10c4 (diff)
downloadotp-71b16c9b704374ea78de05943883befd49846a22.tar.gz
otp-71b16c9b704374ea78de05943883befd49846a22.tar.bz2
otp-71b16c9b704374ea78de05943883befd49846a22.zip
Merge branch 'michaelklishin/patch-1'
* michaelklishin/patch-1: Fix a typo
-rw-r--r--lib/kernel/src/heart.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/kernel/src/heart.erl b/lib/kernel/src/heart.erl
index daed6dd488..77cd5433de 100644
--- a/lib/kernel/src/heart.erl
+++ b/lib/kernel/src/heart.erl
@@ -25,7 +25,7 @@
%%%--------------------------------------------------------------------
%%% This is a rewrite of pre_heart from BS.3.
%%%
-%%% The purpose of this process-module is to act as an supervisor
+%%% The purpose of this process-module is to act as a supervisor
%%% of the entire erlang-system. This 'heart' beats with a frequence
%%% satisfying an external port program *not* reboot the entire
%%% system. If however the erlang-emulator would hang, a reboot is