diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-10-26 09:12:35 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-10-26 09:12:35 +0100 |
| commit | abb62a6d1918bc46ada942ae4f4c79caf2690d86 (patch) | |
| tree | 902cf0d0840c896e8dc7df7ab26bf2e284fc39cc /lib/kernel/doc/src/inet.xml | |
| parent | a76cc1d337c0bf44ecefebeccac2d08e496ba7e8 (diff) | |
| parent | 235bf943d762bfdb5638d23b3270f92c50050b0a (diff) | |
| download | otp-abb62a6d1918bc46ada942ae4f4c79caf2690d86.tar.gz otp-abb62a6d1918bc46ada942ae4f4c79caf2690d86.tar.bz2 otp-abb62a6d1918bc46ada942ae4f4c79caf2690d86.zip | |
Merge branch 'ia/pr/758/OTP-12837' into maint
* ia/pr/758/OTP-12837:
erts: Include test in group so that it is run
erts: Clarify documentation
erts: Add {line_delimiter, byte()} option to inet:setopts/2
Diffstat (limited to 'lib/kernel/doc/src/inet.xml')
| -rw-r--r-- | lib/kernel/doc/src/inet.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml index e5d7ce048a..e6d418dc58 100644 --- a/lib/kernel/doc/src/inet.xml +++ b/lib/kernel/doc/src/inet.xml @@ -981,6 +981,11 @@ setcap cap_sys_admin,cap_sys_ptrace,cap_dac_read_search+epi beam.smp indicated length are accepted and not considered invalid due to internal buffer limitations.</p> </item> + <tag><c>{line_delimiter, Char}</c>(TCP/IP sockets)</tag> + <item> + <p>Sets the line delimiting character for line oriented protocols + (<c>line</c>). Default value is <c>$\n</c>.</p> + </item> <tag><c>{priority, Priority}</c></tag> <item> <p>Set the protocol-defined priority for all packets to be sent |