aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Arendt <[email protected]>2014-06-12 14:41:00 +0200
committerMarcus Arendt <[email protected]>2014-06-12 14:41:00 +0200
commit58483fb7c1b976b94629692bf756fc35c8f15b2d (patch)
tree811e927c967172651525541381b2ff351a7437eb
parent9d656d698bda7a8aba0a52cbf556fb90ffc57c02 (diff)
parent1f0d7a0e7551fb8ca36996d301a2a4025ebc2419 (diff)
downloadotp-58483fb7c1b976b94629692bf756fc35c8f15b2d.tar.gz
otp-58483fb7c1b976b94629692bf756fc35c8f15b2d.tar.bz2
otp-58483fb7c1b976b94629692bf756fc35c8f15b2d.zip
Merge branch 'maint'
-rw-r--r--lib/ssh/src/ssh.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index bf7ba0be7f..743c01a42c 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -432,14 +432,14 @@ handle_ssh_option(Opt) ->
throw({error, {eoptions, Opt}}).
handle_inet_option({active, _} = Opt) ->
- throw({error, {{eoptions, Opt}, "Ssh has built in flow control, "
- "and activ is handled internaly user is not allowd"
+ throw({error, {{eoptions, Opt}, "SSH has built in flow control, "
+ "and active is handled internally, user is not allowed"
"to specify this option"}});
handle_inet_option({inet, Value}) when (Value == inet) or (Value == inet6) ->
Value;
handle_inet_option({reuseaddr, _} = Opt) ->
- throw({error, {{eoptions, Opt},"Is set internaly user is not allowd"
+ throw({error, {{eoptions, Opt},"Is set internally, user is not allowed"
"to specify this option"}});
%% Option verified by inet
handle_inet_option(Opt) ->