aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-10-26 09:12:35 +0100
committerIngela Anderton Andin <[email protected]>2015-10-26 09:12:35 +0100
commitabb62a6d1918bc46ada942ae4f4c79caf2690d86 (patch)
tree902cf0d0840c896e8dc7df7ab26bf2e284fc39cc /erts/doc
parenta76cc1d337c0bf44ecefebeccac2d08e496ba7e8 (diff)
parent235bf943d762bfdb5638d23b3270f92c50050b0a (diff)
downloadotp-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 'erts/doc')
-rw-r--r--erts/doc/src/erlang.xml12
1 files changed, 8 insertions, 4 deletions
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 0492924164..70d000f763 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -874,10 +874,10 @@
</item>
<tag><c>line</c></tag>
<item>
- <p>A packet is a line terminated with newline. The
- newline character is included in the returned packet
- unless the line was truncated according to option
- <c>line_length</c>.</p>
+ <p>A packet is a line terminated by a delimiter byte,
+ default is the latin1 newline character. The delimiter
+ byte is included in the returned packet unless the line
+ was truncated according to option <c>line_length</c>.</p>
</item>
<tag><c>asn1 | cdr | sunrm | fcgi | tpkt</c></tag>
<item>
@@ -933,6 +933,10 @@
if <c>packet_size</c> itself is not set. This use is
only intended for backward compatibility.</p>
</item>
+ <tag><c>{line_delimiter, 0 =&lt; byte() =&lt; 255}</c></tag>
+ <item><p>For packet type <c>line</c>, sets the delimiting byte.
+ Default is the latin1 character <c>$\n</c>.</p>
+ </item>
</taglist>
<p>Examples:</p>
<pre>