aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-08-05 10:34:22 +0200
committerFredrik Gustafsson <[email protected]>2013-08-05 10:34:22 +0200
commitf5acd1050a34f8195437f41d9965357eb107d804 (patch)
tree5be0b9332e191db8f7019a13c3ebb25eb3f6cafd
parent90a600aff71e297d50a16cc3550e4e6c380553e1 (diff)
parent08c4a46e0be4017bbcee596eb4858d0e16eaaec6 (diff)
downloadotp-f5acd1050a34f8195437f41d9965357eb107d804.tar.gz
otp-f5acd1050a34f8195437f41d9965357eb107d804.tar.bz2
otp-f5acd1050a34f8195437f41d9965357eb107d804.zip
Merge branch 'maint'
-rw-r--r--lib/kernel/src/rpc.erl2
-rw-r--r--lib/stdlib/src/gen_server.erl2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/kernel/src/rpc.erl b/lib/kernel/src/rpc.erl
index 78fec2aa2b..7dc51495f7 100644
--- a/lib/kernel/src/rpc.erl
+++ b/lib/kernel/src/rpc.erl
@@ -407,7 +407,7 @@ cast(Node, Mod, Fun, Args) ->
true.
-%% Asynchronous broadcast, returns nothing, it's just send'n prey
+%% Asynchronous broadcast, returns nothing, it's just send 'n' pray
-spec abcast(Name, Msg) -> abcast when
Name :: atom(),
Msg :: term().
diff --git a/lib/stdlib/src/gen_server.erl b/lib/stdlib/src/gen_server.erl
index a85673aa1a..6776f3deaa 100644
--- a/lib/stdlib/src/gen_server.erl
+++ b/lib/stdlib/src/gen_server.erl
@@ -217,7 +217,7 @@ reply({To, Tag}, Reply) ->
catch To ! {Tag, Reply}.
%% -----------------------------------------------------------------
-%% Asyncronous broadcast, returns nothing, it's just send'n prey
+%% Asynchronous broadcast, returns nothing, it's just send 'n' pray
%%-----------------------------------------------------------------
abcast(Name, Request) when is_atom(Name) ->
do_abcast([node() | nodes()], Name, cast_msg(Request)).