aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel
diff options
context:
space:
mode:
authorPéter Dimitrov <[email protected]>2019-04-23 14:46:38 +0200
committerPéter Dimitrov <[email protected]>2019-04-23 14:46:38 +0200
commit40474905b2814f0a17d04a5cf91b0cb543e76653 (patch)
treebc00ce663bc0977ae41afc7c53df726e21137ebc /lib/kernel
parent053e4b191a5bf401bf4afb6787735a42b0dc6019 (diff)
parent94254dfffa9cb4b53a95873e1fbbbce4ce7049ce (diff)
downloadotp-40474905b2814f0a17d04a5cf91b0cb543e76653.tar.gz
otp-40474905b2814f0a17d04a5cf91b0cb543e76653.tar.bz2
otp-40474905b2814f0a17d04a5cf91b0cb543e76653.zip
Merge branch 'peterdmv/ssl/doc-types-and-specs/OTP-15746'
* peterdmv/ssl/doc-types-and-specs/OTP-15746: ssl: Add type specs for http_packet() ssl: Fix type specs of ssl_internal.hrl ssl: Fix type specs of internal handshake functions ssl: Fix dialyzer warnings eldap: Fix dialyzer warnings ssl: Fix missing anchor warning public_key: Accept digest types 'sha1' and 'sha' inet: Document type inet:stat_option() ssl: Changed function specs and ssl.xml ssl: Update standards_compliance.xml OTP-15775 OTP-15776 OTP-15777 Change-Id: Ibe8e8263d6557eaa40cc0681a7ce3fcb373a4120
Diffstat (limited to 'lib/kernel')
-rw-r--r--lib/kernel/doc/src/inet.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml
index 709ba8e8fd..d4678ca5db 100644
--- a/lib/kernel/doc/src/inet.xml
+++ b/lib/kernel/doc/src/inet.xml
@@ -294,6 +294,9 @@ fe80::204:acff:fe17:bf38
<datatype>
<name name="socket_protocol"/>
</datatype>
+ <datatype>
+ <name name="stat_option"/>
+ </datatype>
</datatypes>
<funcs>