diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-04-07 15:51:56 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-04-09 09:08:38 +0200 |
| commit | e6ec11f2c79c1dd51da9750aac6730184a06668b (patch) | |
| tree | 2b118f87e9d9d4e847e59c26961d56ee4b96f9e5 /lib/ssl | |
| parent | 1521bc5840d754ebb38a991855def17a5d9974b9 (diff) | |
| download | otp-e6ec11f2c79c1dd51da9750aac6730184a06668b.tar.gz otp-e6ec11f2c79c1dd51da9750aac6730184a06668b.tar.bz2 otp-e6ec11f2c79c1dd51da9750aac6730184a06668b.zip | |
ssl: Correct merge error
Diffstat (limited to 'lib/ssl')
| -rw-r--r-- | lib/ssl/doc/src/ssl.xml | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml index b8f7501915..eb31b35e1e 100644 --- a/lib/ssl/doc/src/ssl.xml +++ b/lib/ssl/doc/src/ssl.xml @@ -793,17 +793,19 @@ fun(srp, Username :: string(), UserState :: term()) -> </func> <func> - <name>negotiated_next_protocol(Socket) -> {ok, Protocol} | {error, next_protocol_not_negotiated}</name> - <fsummary>Returns the Next Protocol negotiated.</fsummary> + <name>negotiated_protocol(Socket) -> {ok, Protocol} | {error, protocol_not_negotiated}</name> + <fsummary>Returns the protocol negotiated through ALPN or NPN extensions.</fsummary> <type> <v>Socket = sslsocket()</v> <v>Protocol = binary()</v> </type> <desc> - <p>Returns the Next Protocol negotiated.</p> + <p> + Returns the protocol negotiated through ALPN or NPN extensions. + </p> </desc> </func> - + <func> <name>peercert(Socket) -> {ok, Cert} | {error, Reason}</name> <fsummary>Returns the peer certificate.</fsummary> @@ -1084,20 +1086,7 @@ fun(srp, Username :: string(), UserState :: term()) -> </taglist> </desc> </func> - <func> - <name>negotiated_protocol(Socket) -> {ok, Protocol} | {error, protocol_not_negotiated}</name> - <fsummary>Returns the protocol negotiated through ALPN or NPN extensions.</fsummary> - <type> - <v>Socket = sslsocket()</v> - <v>Protocol = binary()</v> - </type> - <desc> - <p> - Returns the protocol negotiated through ALPN or NPN extensions. - </p> - </desc> - </func> - + </funcs> <section> |