diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-08-28 09:12:28 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-08-28 09:12:28 +0200 |
| commit | 6ac80786a25dd3d0dbd1ebf71a1760c342807f97 (patch) | |
| tree | 9ead0b3c0221b6563042f1816df763d4b2a10c53 /lib | |
| parent | f597badb1e2336f921e8f1b1b8842f847f64fa94 (diff) | |
| parent | cbc7418830127a8b70f1accd2492d5dde488bd0f (diff) | |
| download | otp-6ac80786a25dd3d0dbd1ebf71a1760c342807f97.tar.gz otp-6ac80786a25dd3d0dbd1ebf71a1760c342807f97.tar.bz2 otp-6ac80786a25dd3d0dbd1ebf71a1760c342807f97.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssl/doc/src/ssl.xml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml index a836a0c5b6..44c5c1f872 100644 --- a/lib/ssl/doc/src/ssl.xml +++ b/lib/ssl/doc/src/ssl.xml @@ -86,7 +86,8 @@ {user_lookup_fun, {fun(), term()}}, {psk_identity, string()}, {srp_identity, {string(), string()}} | {ssl_imp, ssl_imp()} | {reuse_sessions, boolean()} | {reuse_session, fun()} {next_protocols_advertised, [binary()]} | - {client_preferred_next_protocols, client | server, [binary()]} + {client_preferred_next_protocols, client | server, [binary()]} | + {log_alert, boolean()} </c></p> <p><c>transportoption() = {cb_info, {CallbackModule::atom(), DataTag::atom(), ClosedTag::atom(), ErrTag:atom()}} @@ -446,7 +447,8 @@ fun(srp, Username :: string(), UserState :: term()) -> <tag>{psk_identity, string()}</tag> <item>Specifies the server identity hint the server presents to the client. </item> - + <tag>{log_alert, boolean()}</tag> + <item>If false, error reports will not be displayed.</item> </taglist> </section> |