From 79e3c477f8d0d8ea397820847c576e0a0aaa5323 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Thu, 3 May 2018 13:48:39 +0200
Subject: ssh: Extend rekey_limit to also take an optional time

---
 lib/ssh/doc/src/ssh.xml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'lib/ssh/doc')

diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index 0223831cb1..6aed525e8b 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -763,8 +763,16 @@
     <datatype>
       <name name="rekey_limit_common_option"/>
       <desc>
-	<p>Sets a limit, in bytes, when rekeying is to be initiated. 
-	Defaults to once per each GB and once per hour.</p>
+	<p>Sets the limit when rekeying is to be initiated. Both the max time and max amount of data
+	could be configured:
+	</p>
+	<list>
+	  <item><c>{Minutes, Bytes}</c> initiate rekeying when any of the limits are reached.</item>
+	  <item><c>Bytes</c> initiate rekeying when <c>Bytes</c> number of bytes are transferred,
+	  or at latest after one hour.</item>
+	</list>
+	<p>When a rekeying is done, both the timer and the byte counter are restarted.
+	Defaults to one hour and one GByte.</p>
       </desc>
     </datatype>
 
-- 
cgit v1.2.3