diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-11-04 13:42:59 +0100 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-11-04 13:42:59 +0100 |
| commit | 90b1b181d4fb147dfb7403e910a057289bdd21b2 (patch) | |
| tree | a9d0d809d6d1d2041cf20e07f673d88680737111 /lib | |
| parent | c911744728926ee44a8dafd1ad44168dcc97201e (diff) | |
| parent | 1fd424859cfaebd371a08ab5977623dd20d28067 (diff) | |
| download | otp-90b1b181d4fb147dfb7403e910a057289bdd21b2.tar.gz otp-90b1b181d4fb147dfb7403e910a057289bdd21b2.tar.bz2 otp-90b1b181d4fb147dfb7403e910a057289bdd21b2.zip | |
Merge branch 'klyr/fix-ssl-npn-doc-2/OTP-11457' into maint
* klyr/fix-ssl-npn-doc-2/OTP-11457:
Fix client_preferred_next_protocols documentation
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssl/doc/src/ssl.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml index 6029a09730..445a47c07b 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> |