diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-06-08 16:00:49 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-06-08 16:00:49 +0200 |
| commit | 798219edd8adf36dbcc02ce9c9de71685da85d64 (patch) | |
| tree | 96352c5735cb056464cf758fcee42eb990cbe62e /lib/ssh/doc | |
| parent | a0e14d9c307cd4d1ae964171ff0812bad0a94ef0 (diff) | |
| parent | 9a6662bd15c03a9607d328b5efbaf592a4205574 (diff) | |
| download | otp-798219edd8adf36dbcc02ce9c9de71685da85d64.tar.gz otp-798219edd8adf36dbcc02ce9c9de71685da85d64.tar.bz2 otp-798219edd8adf36dbcc02ce9c9de71685da85d64.zip | |
Merge branch 'ia/ssh/name-spaces/OTP-12675'
* ia/ssh/name-spaces/OTP-12675:
ssh: Correct Makefile
ssh: Add profile option
Diffstat (limited to 'lib/ssh/doc')
| -rw-r--r-- | lib/ssh/doc/src/ssh.xml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml index 0516945c0e..5402d91e03 100644 --- a/lib/ssh/doc/src/ssh.xml +++ b/lib/ssh/doc/src/ssh.xml @@ -500,6 +500,19 @@ kex is implicit but public_key is set explicitly.</p> Can be used to customize the handling of public keys. </p> </item> + + <tag><c>{profile, atom()}</c></tag> + <item> + <p>Used together with <c>ip-address</c> and <c>port</c> to + uniquely identify a ssh daemon. This can be useful in a + virtualized environment, where there can be more that one + server that has the same <c>ip-address</c> and + <c>port</c>. If this property is not explicitly set, it is + assumed that the the <c>ip-address</c> and <c>port</c> + uniquely identifies the SSH daemon. + </p> + </item> + <tag><c><![CDATA[{fd, file_descriptor()}]]></c></tag> <item> <p>Allows an existing file-descriptor to be used |