From bdbb8bfdfb653f4394c7440e0c7d081599c86ddc Mon Sep 17 00:00:00 2001
From: Peter Andersson <peppe@erlang.org>
Date: Mon, 2 May 2016 14:55:54 +0200
Subject: Update the reference manual

OTP-13462
---
 lib/common_test/doc/src/ct_telnet.xml   | 5 ++++-
 lib/common_test/doc/src/unix_telnet.xml | 3 ++-
 lib/common_test/src/ct_telnet.erl       | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/common_test/doc/src/ct_telnet.xml b/lib/common_test/doc/src/ct_telnet.xml
index b7ba352104..1de278d30c 100644
--- a/lib/common_test/doc/src/ct_telnet.xml
+++ b/lib/common_test/doc/src/ct_telnet.xml
@@ -64,6 +64,8 @@
         remaining string terminated) = 0</p></item>
       <item><p>Polling interval (sleep time between polls) = 1 second</p>
       </item>
+      <item><p>The TCP_NODELAY option for the telnet socket
+        is disabled (set to <c>false</c>) per default</p></item>
     </list>
 
     <p>These parameters can be modified by the user with the following
@@ -76,7 +78,8 @@
                     {reconnection_interval,Millisec},
                     {keep_alive,Bool},
                     {poll_limit,N},
-                    {poll_interval,Millisec}]}.</pre>
+                    {poll_interval,Millisec},
+                    {tcp_nodelay,Bool}]}.</pre>
 
     <p><c>Millisec = integer(), N = integer()</c></p>
 
diff --git a/lib/common_test/doc/src/unix_telnet.xml b/lib/common_test/doc/src/unix_telnet.xml
index 189379c39a..a064a222d6 100644
--- a/lib/common_test/doc/src/unix_telnet.xml
+++ b/lib/common_test/doc/src/unix_telnet.xml
@@ -80,7 +80,7 @@
 
   <funcs>
     <func>
-      <name>connect(ConnName, Ip, Port, Timeout, KeepAlive, Extra) -&gt; {ok, Handle} | {error, Reason}</name>
+      <name>connect(ConnName, Ip, Port, Timeout, KeepAlive, TCPNoDelay, Extra) -&gt; {ok, Handle} | {error, Reason}</name>
       <fsummary>Callback for ct_telnet.erl.</fsummary>
         <type>
           <v>ConnName = target_name()</v>
@@ -88,6 +88,7 @@
           <v>Port = integer()</v>
           <v>Timeout = integer()</v>
           <v>KeepAlive = bool()</v>
+	  <v>TCPNoDelay = bool()</v>
           <v>Extra = target_name() | {Username, Password}</v>
           <v>Username = string()</v>
           <v>Password = string()</v>
diff --git a/lib/common_test/src/ct_telnet.erl b/lib/common_test/src/ct_telnet.erl
index cdc08fd9d4..f5f4f648f4 100644
--- a/lib/common_test/src/ct_telnet.erl
+++ b/lib/common_test/src/ct_telnet.erl
@@ -43,7 +43,7 @@
 %%                    {keep_alive,Bool},
 %%                    {poll_limit,N},
 %%                    {poll_interval,Millisec},
-%%                    {tcp_nodelay,Bool]}.</pre>
+%%                    {tcp_nodelay,Bool}]}.</pre>
 %% <p><code>Millisec = integer(), N = integer()</code></p>
 %% <p>Enter the <code>telnet_settings</code> term in a configuration 
 %% file included in the test and ct_telnet will retrieve the information
-- 
cgit v1.2.3