From 64a3651b3ece1a1e3195f20e37247f929d179f61 Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Wed, 14 Sep 2011 10:57:17 +0200
Subject: Remove old ssl implementation and deprecated function ssl:peercert/1

---
 lib/ssl/doc/src/ssl.xml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

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

diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml
index 0c4c8796be..66d2644b76 100644
--- a/lib/ssl/doc/src/ssl.xml
+++ b/lib/ssl/doc/src/ssl.xml
@@ -121,8 +121,6 @@
    <p> <c>hash() = md5 | sha
     </c></p>
 
-    <p><c>ssl_imp() = new | old - default is new.</c></p>
-    
   </section>
 
   <section>
@@ -177,9 +175,9 @@
       by the peer also.
       </item>
 
-      <tag>{ssl_imp, ssl_imp()}</tag>
-      <item>Specify which ssl implementation you want to use. Defaults to
-      new.
+      <tag>{ssl_imp, new | old}</tag>
+      <item>No longer has any meaning as the old implementation has
+      been removed, it will be ignored.
       </item>
 
       <tag>{secure_renegotiate, boolean()}</tag>
-- 
cgit v1.2.3


From 12014af687bc8555fce572493cadfd0cc872ed59 Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Wed, 28 Sep 2011 09:57:11 +0200
Subject: Corrected documentation bug

---
 lib/ssl/doc/src/ssl.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml
index 0c4c8796be..47991ca477 100644
--- a/lib/ssl/doc/src/ssl.xml
+++ b/lib/ssl/doc/src/ssl.xml
@@ -649,10 +649,10 @@ fun(OtpCert :: #'OTPCertificate'{}, Event :: {bad_cert, Reason :: atom()} |
         <p> Upgrades a gen_tcp, or
 	  equivalent, socket to an ssl socket i.e. performs the
 	ssl server-side handshake.</p>
-	<p><warning>Note that the listen socket should be in {active, false} mode
+	<warning><p>Note that the listen socket should be in {active, false} mode
 	before telling the client that the server is ready to upgrade
 	and calling this function, otherwise the upgrade may
-	or may not succeed depending on timing.</warning></p>
+	or may not succeed depending on timing.</p></warning>
       </desc>
     </func>
     
-- 
cgit v1.2.3