From 04faa82c43ba43929087b6d91fb1f9cbff34cb99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Dimitrov?= <peterdmv@erlang.org>
Date: Wed, 24 Apr 2019 12:42:26 +0200
Subject: ssl: Update function ssl:eccs/1

Remove support of version tuples (e.g. {3,3}) from API function
ssl:eccs/1.

Update function spec and documentation.

Change-Id: I891e42a2ca31c3e06b4edeeb866c0df874f2035b
---
 lib/ssl/doc/src/ssl.xml | 14 +-------------
 1 file changed, 1 insertion(+), 13 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 422bd6a19d..8e4c21ba02 100644
--- a/lib/ssl/doc/src/ssl.xml
+++ b/lib/ssl/doc/src/ssl.xml
@@ -128,7 +128,7 @@
       <name name="hostname"/>
      </datatype>
 
-       <datatype>
+     <datatype>
       <name name="ip_address"/>
      </datatype>
 
@@ -136,26 +136,14 @@
        <name name="protocol_version"/>
      </datatype>
 
-     <datatype>
-       <name name="protocol_version_tuple"/>
-     </datatype>
-
      <datatype>
        <name name="tls_version"/>
      </datatype>
 
-     <datatype>
-       <name name="tls_version_tuple"/>
-     </datatype>
-
      <datatype>
        <name name="dtls_version"/>
      </datatype>
 
-     <datatype>
-       <name name="dtls_version_tuple"/>
-     </datatype>
-
      <datatype>
        <name name="tls_legacy_version"/>
      </datatype>
-- 
cgit v1.2.3


From 3008d77a2c93b45c45da1739d63abf2f476ad490 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Dimitrov?= <peterdmv@erlang.org>
Date: Wed, 24 Apr 2019 13:14:12 +0200
Subject: ssl: Update type spec of ssl:suite_to_str/1

Change-Id: I7987e80cca7af184a9f40cdcd8ea8f07c318ba0d
---
 lib/ssl/doc/src/ssl.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(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 8e4c21ba02..27046a8434 100644
--- a/lib/ssl/doc/src/ssl.xml
+++ b/lib/ssl/doc/src/ssl.xml
@@ -1600,7 +1600,7 @@ fun(srp, Username :: string(), UserState :: term()) ->
     </func>
 
     <func>
-      <name since="OTP 21.0" name="suite_to_str" arity="1" />
+      <name since="OTP 21.0" name="suite_to_str" arity="1" clause_i="1" />
       <fsummary>Returns the string representation of a cipher suite.</fsummary>
       <desc>
         <p>Returns the string representation of a cipher suite.</p>
-- 
cgit v1.2.3


From 2323f49b7d43213a7f54247b4b1b3d3a6d17ff76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Dimitrov?= <peterdmv@erlang.org>
Date: Wed, 24 Apr 2019 15:10:16 +0200
Subject: ssl: Refer documentation of HttpPacket from erts

Do not document http_packet() in ssl but refer to description of
erlang:decode_packet/3.

Change-Id: Ib2d0e4fc9605e40fe98bb249bc17fc39046d137a
---
 lib/ssl/doc/src/ssl.xml | 45 +++++----------------------------------------
 1 file changed, 5 insertions(+), 40 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 27046a8434..d626748af6 100644
--- a/lib/ssl/doc/src/ssl.xml
+++ b/lib/ssl/doc/src/ssl.xml
@@ -252,46 +252,6 @@
       <name name="reason"/>
      </datatype>
 
-     <datatype>
-      <name name="http_packet"/>
-     </datatype>
-
-     <datatype>
-      <name name="http_request"/>
-     </datatype>
-
-     <datatype>
-      <name name="http_response"/>
-     </datatype>
-
-     <datatype>
-      <name name="http_header"/>
-     </datatype>
-
-     <datatype>
-      <name name="http_error"/>
-     </datatype>
-
-     <datatype>
-      <name name="http_method"/>
-     </datatype>
-
-     <datatype>
-      <name name="http_uri"/>
-     </datatype>
-
-     <datatype>
-      <name name="http_version"/>
-     </datatype>
-
-     <datatype>
-      <name name="http_field"/>
-     </datatype>
-
-     <datatype>
-      <name name="http_string"/>
-     </datatype>
-
     <datatype_title>TLS/DTLS OPTION DESCRIPTIONS - COMMON for SERVER and CLIENT</datatype_title>
     
     <datatype>
@@ -1495,6 +1455,11 @@ fun(srp, Username :: string(), UserState :: term()) ->
       <name since="" name="recv" arity="2" />
       <name since="" name="recv" arity="3" />
       <fsummary>Receives data on a socket.</fsummary>
+      <type_desc variable="HttpPacket">See the description of
+        <c>HttpPacket</c> in
+        <seealso marker="erts:erlang#decode_packet/3"><c>erlang:decode_packet/3</c></seealso>
+	in ERTS.
+      </type_desc>
       <desc>
         <p>Receives a packet from a socket in passive
           mode. A closed socket is indicated by return value
-- 
cgit v1.2.3