aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-11-16 13:24:41 +0100
committerHenrik Nord <[email protected]>2015-11-16 13:24:41 +0100
commitc16c45a587a199987dae799ea02fb9c32216854f (patch)
tree76a6f48fd47332656940cbc57324d46f04ed103c /erts
parentfcf3804e78e921ecdf4f422cb97eca94fdf34fb4 (diff)
parenta36b6aeeeb3e40a7ba1737b596ede3e321540211 (diff)
downloadotp-c16c45a587a199987dae799ea02fb9c32216854f.tar.gz
otp-c16c45a587a199987dae799ea02fb9c32216854f.tar.bz2
otp-c16c45a587a199987dae799ea02fb9c32216854f.zip
Merge branch 'c-rack/fix-typo-prim-inet' into maint
* c-rack/fix-typo-prim-inet: Fix minor typo "timout" -> "timeout"
Diffstat (limited to 'erts')
-rw-r--r--erts/preloaded/src/prim_inet.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/preloaded/src/prim_inet.erl b/erts/preloaded/src/prim_inet.erl
index d5c8fd4268..bd74831bb7 100644
--- a/erts/preloaded/src/prim_inet.erl
+++ b/erts/preloaded/src/prim_inet.erl
@@ -232,7 +232,7 @@ bindx(S, AddFlag, Addrs) ->
%% if timeout is given:
%% timeout < 0 -> infinity
%% 0 -> immediate connect (mostly works for loopback)
-%% > 0 -> wait for timout ms if not connected then
+%% > 0 -> wait for timeout ms if not connected then
%% return {error, timeout}
%%
%% ASYNC_CONNECT(insock(), IP, Port, Timeout) -> {ok, S, Ref} | {error, Reason}
@@ -273,7 +273,7 @@ async_connect(S, IP, Port, Time) ->
%% if timeout is given:
%% timeout < 0 -> infinity
%% 0 -> immediate accept (poll)
-%% > 0 -> wait for timout ms for accept if no accept then
+%% > 0 -> wait for timeout ms for accept if no accept then
%% return {error, timeout}
%%
%% ASYNC_ACCEPT(insock(), Timeout)