diff options
| author | Henrik Nord <[email protected]> | 2011-08-16 15:41:17 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2011-08-16 15:41:30 +0200 |
| commit | 8a0729f489d202f682023142d90dd61a155edc2c (patch) | |
| tree | 8c0b322787eb3ee12eb5224ee2612d92f3b3f442 /lib/ssl/src/ssl_connection.erl | |
| parent | 48d0c4adbe85450f1224311f9b8495affaae9c6a (diff) | |
| parent | 89ca4daa2eb4b928387133b0a9c60f55adea267d (diff) | |
| download | otp-8a0729f489d202f682023142d90dd61a155edc2c.tar.gz otp-8a0729f489d202f682023142d90dd61a155edc2c.tar.bz2 otp-8a0729f489d202f682023142d90dd61a155edc2c.zip | |
Merge branch 'cr/trivia' into dev
* cr/trivia:
replace "a ssl" with "an ssl"
reindent pkix_path_validation/3
Trivial documentation fixes
OTP-9464
Diffstat (limited to 'lib/ssl/src/ssl_connection.erl')
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index 21b021afb0..79570c520a 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -131,7 +131,7 @@ recv(Pid, Length, Timeout) -> pid(), tuple(), timeout()) -> {ok, #sslsocket{}} | {error, reason()}. %% -%% Description: Connect to a ssl server. +%% Description: Connect to an ssl server. %%-------------------------------------------------------------------- connect(Host, Port, Socket, Options, User, CbInfo, Timeout) -> try start_fsm(client, Host, Port, Socket, Options, User, CbInfo, @@ -145,7 +145,7 @@ connect(Host, Port, Socket, Options, User, CbInfo, Timeout) -> pid(), tuple(), timeout()) -> {ok, #sslsocket{}} | {error, reason()}. %% -%% Description: Performs accept on a ssl listen socket. e.i. performs +%% Description: Performs accept on an ssl listen socket. e.i. performs %% ssl handshake. %%-------------------------------------------------------------------- ssl_accept(Port, Socket, Opts, User, CbInfo, Timeout) -> @@ -185,7 +185,7 @@ socket_control(Socket, Pid, CbModule) -> %%-------------------------------------------------------------------- -spec close(pid()) -> ok | {error, reason()}. %% -%% Description: Close a ssl connection +%% Description: Close an ssl connection %%-------------------------------------------------------------------- close(ConnectionPid) -> case sync_send_all_state_event(ConnectionPid, close) of |