diff options
author | Ingela Anderton Andin <[email protected]> | 2011-06-28 17:07:58 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2011-06-28 17:07:58 +0200 |
commit | 17f389d3d79e7c020431f3b6941cc301a977c5d8 (patch) | |
tree | a72a11c8af3f274ac82b5a5c65487ba70fee03fd /lib/ssl/doc | |
parent | d1e636f236a4a76e999ff516718c814f3eeed617 (diff) | |
parent | 98c0cbbe4cae890bbda6a1d297c9c161534adb6a (diff) | |
download | otp-17f389d3d79e7c020431f3b6941cc301a977c5d8.tar.gz otp-17f389d3d79e7c020431f3b6941cc301a977c5d8.tar.bz2 otp-17f389d3d79e7c020431f3b6941cc301a977c5d8.zip |
Merge branch 'ia/ssl/inet-getopts-crash/OTP-9382' into dev
* ia/ssl/inet-getopts-crash/OTP-9382:
Handle inet:getopts/2 and inet:setopts/2 crashes
Diffstat (limited to 'lib/ssl/doc')
-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> |