aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2012-02-16 09:48:26 +0100
committerIngela Anderton Andin <[email protected]>2012-02-16 09:48:26 +0100
commit815645f54acd5876211eda76b7299d827e553bfe (patch)
tree61a9af34b090b2999273c095f60c55f1e3ab2d8a /lib
parent4d9dd06871d268942df763e556a0afb0bb6cf471 (diff)
parent7d330005f030b547259b3c6151099d6a6903c5b3 (diff)
downloadotp-815645f54acd5876211eda76b7299d827e553bfe.tar.gz
otp-815645f54acd5876211eda76b7299d827e553bfe.tar.bz2
otp-815645f54acd5876211eda76b7299d827e553bfe.zip
Merge branch 'ia/ssh/server-user-dir-doc' into maint
* ia/ssh/server-user-dir-doc: Document user_dir for the server
Diffstat (limited to 'lib')
-rw-r--r--lib/ssh/doc/src/ssh.xml8
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index c205fc5dc7..ed88b3a1af 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -234,6 +234,14 @@
option <c>shell</c> which is much less work than implementing
your own cli channel.
</item>
+ <tag><c><![CDATA[{user_dir, String}]]></c></tag>
+ <item>
+ <p>Sets the user directory e.i. the directory containing
+ ssh configuration files for the user such as
+ <c><![CDATA[known_hosts]]></c>, <c><![CDATA[id_rsa, id_dsa]]></c> and
+ <c><![CDATA[authorized_key]]></c>. Defaults to the directory normally
+ referred to as <c><![CDATA[~/.ssh]]></c> </p>
+ </item>
<tag><c><![CDATA[{system_dir, string()}]]></c></tag>
<item>
<p>Sets the system directory, containing the host files