aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-08-28 09:12:22 +0200
committerFredrik Gustafsson <[email protected]>2013-08-28 09:12:22 +0200
commitcbc7418830127a8b70f1accd2492d5dde488bd0f (patch)
tree4a9799a5e0c66483989c7486aee4eeee05bfba09
parent682e562a20c2ab650a3a5e0f885af19bce0d5a14 (diff)
parentede48cb459a6d075edd0fd2855f6b3672d8f3625 (diff)
downloadotp-cbc7418830127a8b70f1accd2492d5dde488bd0f.tar.gz
otp-cbc7418830127a8b70f1accd2492d5dde488bd0f.tar.bz2
otp-cbc7418830127a8b70f1accd2492d5dde488bd0f.zip
Merge branch 'fredrik/ssl/log_alert_doc/OTP-11271' into maint
* fredrik/ssl/log_alert_doc/OTP-11271: ssl: documentation regarding log_alert
-rw-r--r--lib/ssl/doc/src/ssl.xml6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml
index 1645eb15f3..6029a09730 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>