diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-02-16 09:50:31 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-02-16 09:50:31 +0100 |
| commit | ddfe258f12a7706f3aea4f20bf6fc46b839ab70c (patch) | |
| tree | e057b714de8b8a2ed776086bed910b28be1aae2f | |
| parent | d158a494608cbc914df9b49e8a994f6e5bfaef2b (diff) | |
| parent | 815645f54acd5876211eda76b7299d827e553bfe (diff) | |
| download | otp-ddfe258f12a7706f3aea4f20bf6fc46b839ab70c.tar.gz otp-ddfe258f12a7706f3aea4f20bf6fc46b839ab70c.tar.bz2 otp-ddfe258f12a7706f3aea4f20bf6fc46b839ab70c.zip | |
Merge remote branch 'upstream/maint'
* upstream/maint:
Document user_dir for the server
| -rw-r--r-- | lib/ssh/doc/src/ssh.xml | 8 |
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 |