aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/doc/src/ssh.xml
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2018-02-22 12:13:18 +0100
committerHans Nilsson <[email protected]>2018-02-22 12:13:18 +0100
commit41979694d18637c62433a44aaf4a07b2e02e104d (patch)
treee3be25825b8cb63e693f640840ab2dfa79f11d45 /lib/ssh/doc/src/ssh.xml
parent1540a0758b8d60af7b3832158015bd8cf64016af (diff)
parent398dcda0815f12fb177bbb3bf68f6b424c2a62f2 (diff)
downloadotp-41979694d18637c62433a44aaf4a07b2e02e104d.tar.gz
otp-41979694d18637c62433a44aaf4a07b2e02e104d.tar.bz2
otp-41979694d18637c62433a44aaf4a07b2e02e104d.zip
Merge branch 'maint'
* maint: Updated OTP version Prepare release ssh: Add option save_accepted_host ssh: No error message for signal kill ssh: Dont repeat supervisor defaults in map fields ssh: Move starting of channel child to ssh_channel_sup ssh: Test case for sup tree when shell server proc times out Conflicts: OTP_VERSION
Diffstat (limited to 'lib/ssh/doc/src/ssh.xml')
-rw-r--r--lib/ssh/doc/src/ssh.xml12
1 files changed, 12 insertions, 0 deletions
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index 337f4094cc..acf94ff6af 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -227,6 +227,18 @@
</item>
</list>
</item>
+
+ <tag><c><![CDATA[{save_accepted_host, boolean()}]]></c></tag>
+ <item>
+ <p>If <c>true</c>, the client saves an accepted host key to avoid the
+ accept question the next time the same host is connected. If the option
+ <c>key_cb</c> is not present, the key is saved in the file "known_hosts".
+ </p>
+ <p>If <c>false</c>, the key is not saved and the key will still be unknown
+ at the next access of the same host.
+ </p>
+ </item>
+
<tag><c><![CDATA[{user_interaction, boolean()}]]></c></tag>
<item>
<p>If <c>false</c>, disables the client to connect to the server