aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-11-04 13:43:05 +0100
committerFredrik Gustafsson <[email protected]>2013-11-04 13:43:05 +0100
commitce8be1d7e8d0d3ea15134e441a4d134a63129db6 (patch)
tree76085d9d61ef792cddf73d25b7ec458f88eb35e0 /lib
parent3f444dbea12b34698ebbf012f3990b769422fec3 (diff)
parent90b1b181d4fb147dfb7403e910a057289bdd21b2 (diff)
downloadotp-ce8be1d7e8d0d3ea15134e441a4d134a63129db6.tar.gz
otp-ce8be1d7e8d0d3ea15134e441a4d134a63129db6.tar.bz2
otp-ce8be1d7e8d0d3ea15134e441a4d134a63129db6.zip
Merge branch 'maint'
Diffstat (limited to 'lib')
-rw-r--r--lib/ssl/doc/src/ssl.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml
index 44c5c1f872..28970f9aa8 100644
--- a/lib/ssl/doc/src/ssl.xml
+++ b/lib/ssl/doc/src/ssl.xml
@@ -86,7 +86,7 @@
{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()]} | {client | server, [binary()], binary()}} |
{log_alert, boolean()}
</c></p>
@@ -353,8 +353,8 @@ fun(srp, Username :: string(), UserState :: term()) ->
when possible.
</item>
- <tag>{client_preferred_next_protocols, Precedence :: server | client, ClientPrefs :: [binary()]}</tag>
- <tag>{client_preferred_next_protocols, Precedence :: server | client, ClientPrefs :: [binary()], Default :: binary()}</tag>
+ <tag>{client_preferred_next_protocols, {Precedence :: server | client, ClientPrefs :: [binary()]}}</tag>
+ <tag>{client_preferred_next_protocols, {Precedence :: server | client, ClientPrefs :: [binary()], Default :: binary()}}</tag>
<item>
<p>Indicates the client will try to perform Next Protocol
Negotiation.</p>