Merge branch 'bmk/inets/ossl_removed_from_ssl_app/OTP-9522' into bmk/inets/inets58_integration

3 files changed, 16 insertions, 16 deletions

diff --git a/lib/inets/doc/src/httpc.xml b/lib/inets/doc/src/httpc.xml
index d1671ac9bd..b1f964ae69 100644
--- a/lib/inets/doc/src/httpc.xml
+++ b/lib/inets/doc/src/httpc.xml
@@ -28,8 +28,10 @@
     <date></date>
     <rev></rev>
   </header>
+
   <module>httpc</module>
   <modulesummary>An HTTP/1.1 client </modulesummary>
+
   <description>
     <p>This module provides the API to a HTTP/1.1 compatible client according 
       to RFC 2616, caching is currently not supported.</p>
@@ -167,7 +169,6 @@ filename()       = string()
         <v>http_option() = {timeout,         timeout()} | 
                            {connect_timeout, timeout()} | 
                            {ssl,             ssloptions()} | 
-                           {ossl,            ssloptions()} | 
                            {essl,            ssloptions()} | 
                            {autoredirect,    boolean()} | 
                            {proxy_auth, {userstring(), passwordstring()}} | 
@@ -206,6 +207,7 @@ filename()       = string()
 	to the <c>receiver</c> depending on that value. </p>
 
         <p>Http option (<c>http_option()</c>) details: </p>
+        <marker id="request2_http_options"></marker>
         <taglist>
           <tag><c><![CDATA[timeout]]></c></tag>
           <item>
@@ -231,16 +233,9 @@ filename()       = string()
             <p>Defaults to <c>[]</c>. </p>
 	  </item>
 
-          <tag><c><![CDATA[ossl]]></c></tag>
-          <item>
-            <p>If using the OpenSSL based (old) implementation of SSL, 
-	    these SSL-specific options are used. </p>
-            <p>Defaults to <c>[]</c>. </p>
-	  </item>
-
           <tag><c><![CDATA[essl]]></c></tag>
           <item>
-            <p>If using the Erlang based (new) implementation of SSL, 
+            <p>If using the Erlang based implementation of SSL, 
 	    these SSL-specific options are used. </p>
             <p>Defaults to <c>[]</c>. </p>
 	  </item>
diff --git a/lib/inets/doc/src/httpd.xml b/lib/inets/doc/src/httpd.xml
index edacb73b65..f88099a82e 100644
--- a/lib/inets/doc/src/httpd.xml
+++ b/lib/inets/doc/src/httpd.xml
@@ -148,13 +148,11 @@
 	in the apache like configuration file.
       </item>
 
-      <tag>{socket_type, ip_comm | ssl | ossl | essl}</tag>
+      <tag>{socket_type, ip_comm | ssl | essl}</tag>
       <item>
-	<p>When using ssl, there are several alternatives. 
-          <c>ossl</c> specifically uses the OpenSSL based (old) SSL. 
-          <c>essl</c> specifically uses the Erlang based (new) SSL. 
-          When using <c>ssl</c> it <em>currently</em> defaults to 
-          <c>essl</c>. </p>
+	<p>When using ssl, there are currently only one alternative. 
+	<c>essl</c> specifically uses the Erlang based SSL. 
+	<c>ssl</c> defaults to <c>essl</c>. </p>
 	<p>Defaults to <c>ip_comm</c>. </p> 
       </item>
 
@@ -162,7 +160,7 @@
       <item>
 	<p>Defaults to <c>inet6fb4. </c> </p>
         <p>Note that this option is only used when the option 
-          <c>socket_type</c> has the value <c>ip_comm</c>. </p>
+	<c>socket_type</c> has the value <c>ip_comm</c>. </p>
       </item>
 
     </taglist>
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 2ced461c85..c53aa653d8 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -80,6 +80,13 @@
 	  <p>Own Id: OTP-9359</p>
         </item>
 
+        <item>
+          <p>[httpc|httpd] The old ssl implementation (based on OpenSSL), 
+	  has been deprecated. The config option that specified usage of 
+	  this version of the ssl app, <c>ossl</c>, has been removed. </p>
+	  <p>Own Id: OTP-9522</p>
+        </item>
+
       </list>
 
     </section>