From afac3c7136c48d8630bd400c5454e146915e634f Mon Sep 17 00:00:00 2001
From: Serge Aleynikov <saleyn@gmail.com>
Date: Mon, 26 Oct 2015 14:46:54 +0100
Subject: erts: Add {line_delimiter, byte()} option to inet:setopts/2

A new {line_delimiter, byte()} option allows line-oriented TCP-based
protocols to use a custom line delimiting character. It is to be
used in conjunction with {packet, line}.

This option also works with erlang:decode_packet/3 when its first argument
is 'line'.
---
 erts/doc/src/erlang.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'erts/doc/src')

diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 0492924164..1963b27915 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -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 &le; char() &le; 255}</c></tag>
+              <item><p>For packet type <c>line</c>, sets delimiting character.
+                Default <c>$\n</c>.</p>
+              </item>
             </taglist>
         <p>Examples:</p>
         <pre>
-- 
cgit v1.2.3


From 18270f5c208149323964ff9057b1b740cb72ea85 Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Fri, 16 Oct 2015 11:43:20 +0200
Subject: erts: Clarify documentation

---
 erts/doc/src/erlang.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'erts/doc/src')

diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 1963b27915..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,9 +933,9 @@
                 if <c>packet_size</c> itself is not set. This use is
                 only intended for backward compatibility.</p>
               </item>
-              <tag><c>{line_delimiter, 0 &le; char() &le; 255}</c></tag>
-              <item><p>For packet type <c>line</c>, sets delimiting character.
-                Default <c>$\n</c>.</p>
+              <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>
-- 
cgit v1.2.3