diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-06-28 17:11:07 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-06-28 17:11:07 +0200 |
| commit | f32197cc5342b5012b960711d6824dd694524e70 (patch) | |
| tree | 2ff113c5fa75288736d50df15c8df08453f2b433 /lib/ssl/doc/src/ssl.xml | |
| parent | 49846524934f74abcd44bbc315d9314c940d34ba (diff) | |
| parent | ee679e41535dd83aba7c8fb55fa12bdc6e89313c (diff) | |
| download | otp-f32197cc5342b5012b960711d6824dd694524e70.tar.gz otp-f32197cc5342b5012b960711d6824dd694524e70.tar.bz2 otp-f32197cc5342b5012b960711d6824dd694524e70.zip | |
Merge branch 'dev' into major
* dev:
Use erlang:send_after instead of timer:send_after
Handle inet:getopts/2 and inet:setopts/2 crashes
Diffstat (limited to 'lib/ssl/doc/src/ssl.xml')
| -rw-r--r-- | lib/ssl/doc/src/ssl.xml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml index 0da6bbee5b..566068beaf 100644 --- a/lib/ssl/doc/src/ssl.xml +++ b/lib/ssl/doc/src/ssl.xml @@ -480,7 +480,6 @@ fun(OtpCert :: #'OTPCertificate'{}, Event :: {bad_cert, Reason :: atom()} | </func> <func> - <name>getopts(Socket) -> </name> <name>getopts(Socket, OptionNames) -> {ok, [socketoption()]} | {error, Reason}</name> <fsummary>Get the value of the specified options.</fsummary> @@ -489,8 +488,7 @@ fun(OtpCert :: #'OTPCertificate'{}, Event :: {bad_cert, Reason :: atom()} | <v>OptionNames = [atom()]</v> </type> <desc> - <p>Get the value of the specified socket options, if no - options are specified all options are returned. + <p>Get the value of the specified socket options. </p> </desc> </func> |