aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/doc/src/inet.xml
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2016-08-19 14:33:26 +0200
committerSverker Eriksson <[email protected]>2016-08-19 14:33:26 +0200
commit04e925591e26c25fcdf8185324664135378f9291 (patch)
tree8e2be7ddb6d2a7daba1355862d984d7b76a00f6d /lib/kernel/doc/src/inet.xml
parent2bb55f7bb6c8aa534d84087da18736e431bb482b (diff)
parent74eea0fbb2cb5d0bb211dad19891d2aae31e170d (diff)
downloadotp-04e925591e26c25fcdf8185324664135378f9291.tar.gz
otp-04e925591e26c25fcdf8185324664135378f9291.tar.bz2
otp-04e925591e26c25fcdf8185324664135378f9291.zip
Merge branch 'maint'
Diffstat (limited to 'lib/kernel/doc/src/inet.xml')
-rw-r--r--lib/kernel/doc/src/inet.xml9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml
index c0dce2f50c..8cc21bf3e2 100644
--- a/lib/kernel/doc/src/inet.xml
+++ b/lib/kernel/doc/src/inet.xml
@@ -151,6 +151,12 @@ fe80::204:acff:fe17:bf38
<name name="socket_address"/>
</datatype>
<datatype>
+ <name name="socket_getopt"/>
+ </datatype>
+ <datatype>
+ <name name="socket_setopt"/>
+ </datatype>
+ <datatype>
<name name="returned_non_ip_address"/>
<desc>
<p>
@@ -327,8 +333,6 @@ fe80::204:acff:fe17:bf38
<func>
<name name="getopts" arity="2"/>
<fsummary>Get one or more options for a socket.</fsummary>
- <type name="socket_getopt"/>
- <type name="socket_setopt"/>
<desc>
<p>Gets one or more options for a socket. For a list of available
options, see
@@ -580,7 +584,6 @@ get_tcpi_sacked(Sock) ->
<func>
<name name="setopts" arity="2"/>
<fsummary>Set one or more options for a socket.</fsummary>
- <type name="socket_setopt"/>
<desc>
<p>Sets one or more options for a socket.</p>
<p>The following options are available:</p>