From e6ec11f2c79c1dd51da9750aac6730184a06668b Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Tue, 7 Apr 2015 15:51:56 +0200
Subject: ssl: Correct merge error

---
 lib/ssl/doc/src/ssl.xml | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

(limited to 'lib/ssl/doc/src')

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>
-- 
cgit v1.2.3