aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-01-16 11:55:57 +0100
committerFredrik Gustafsson <[email protected]>2013-01-16 11:55:57 +0100
commitf3e8f8cbe5429a2b59918d82f39f463bbf64972b (patch)
tree2913928d2c17058dc3af8edff95fbccedca8cbfa
parentfa6771380931c7ded0ad4d36e6cd2554bb932dfc (diff)
parent6187ba956f19e3b457003e5ee884aec5190d9fbb (diff)
downloadotp-f3e8f8cbe5429a2b59918d82f39f463bbf64972b.tar.gz
otp-f3e8f8cbe5429a2b59918d82f39f463bbf64972b.tar.bz2
otp-f3e8f8cbe5429a2b59918d82f39f463bbf64972b.zip
Merge branch 'fredrik/ssh/fix-idle_time-doc'
* fredrik/ssh/fix-idle_time-doc: Re-added documentation for idle_time option
-rw-r--r--lib/ssh/doc/src/ssh.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index a0afb5056e..7f7d887d5e 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -188,6 +188,9 @@
<p>Provide, in bytes, when rekeying should be initiated,
defaults to one time each GB and one time per hour.</p>
</item>
+ <tag><c><![CDATA[{idle_time, integer()}]]></c></tag>
+ <item>
+ <p>Sets a timeout on connection when no channels are active, default is infinity</p></item>
</taglist>
</desc>
</func>