aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2011-09-06 10:18:19 +0200
committerIngela Anderton Andin <[email protected]>2011-09-06 10:18:19 +0200
commite7af9a6004cc13f1c49c4b6304adc9b8cd859cba (patch)
treef9b8c0a031d0f3a4af6dff8854abde84925a1dd2
parent7a24540d46b9ef3fcaa901b3765ded81a76586ca (diff)
parent5bdbfa33f7142b888f833b8f2f80cdf2198d9212 (diff)
downloadotp-e7af9a6004cc13f1c49c4b6304adc9b8cd859cba.tar.gz
otp-e7af9a6004cc13f1c49c4b6304adc9b8cd859cba.tar.bz2
otp-e7af9a6004cc13f1c49c4b6304adc9b8cd859cba.zip
Merge branch 'dev' into major
* dev: Corrected faulty dialyzer spec
-rw-r--r--lib/ssl/src/ssl.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl
index 6074dab3ca..59f8479a4c 100644
--- a/lib/ssl/src/ssl.erl
+++ b/lib/ssl/src/ssl.erl
@@ -99,11 +99,11 @@ stop() ->
application:stop(ssl).
%%--------------------------------------------------------------------
--spec connect(host() | inet:port_number(), [connect_option()]) -> {ok, #sslsocket{}} |
+-spec connect(host() | port(), [connect_option()]) -> {ok, #sslsocket{}} |
{error, reason()}.
--spec connect(host() | inet:port_number(), [connect_option()] | inet:port_number(), timeout() | list()) ->
+-spec connect(host() | port(), [connect_option()] | inet:port_number(), timeout() | list()) ->
{ok, #sslsocket{}} | {error, reason()}.
--spec connect(host() | inet:port_number(), inet:port_number(), list(), timeout()) ->
+-spec connect(host() | port(), inet:port_number(), list(), timeout()) ->
{ok, #sslsocket{}} | {error, reason()}.
%%