From ebcece7f317f6d4e4d580c1f5629f4f46defe272 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Wed, 9 May 2018 11:42:49 +0200
Subject: ssh: Add infinity as values to rekey_limit

Zero is removed from the Minutes in the new tuple value to remove a loop possibility.  The zero is kept for bytes since that is not dangerous and a removal would be an unnecssary incompatibility.
---
 lib/ssh/doc/src/ssh.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'lib/ssh/doc/src')

diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index 6aed525e8b..407956cc6f 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -762,6 +762,8 @@
 
     <datatype>
       <name name="rekey_limit_common_option"/>
+      <name name="limit_bytes"/>
+      <name name="limit_time"/>
       <desc>
 	<p>Sets the limit when rekeying is to be initiated. Both the max time and max amount of data
 	could be configured:
@@ -773,6 +775,10 @@
 	</list>
 	<p>When a rekeying is done, both the timer and the byte counter are restarted.
 	Defaults to one hour and one GByte.</p>
+	<p>If <c>Minutes</c> is set to <c>infinity</c>, no rekeying will ever occur due to that max time has passed.
+	Setting <c>Bytes</c> to <c>infinity</c> will inhibit rekeying after a certain amount of data has been transferred.
+	If the option value is set to <c>{infinity, infinity}</c>, no rekeying will be initiated. Note that rekeying initiated
+	by the peer will still be performed.</p>
       </desc>
     </datatype>
 
-- 
cgit v1.2.3