diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-06-12 11:00:05 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-06-12 11:00:05 +0200 |
| commit | dc7a9868aa1259f729f8437d92a7948ba1098401 (patch) | |
| tree | 4042e83b991607c341136374f63e9c186b7a993b /lib/ssh/doc/src/ssh.xml | |
| parent | 0ce0df2b41c47735ec342853b305041394423633 (diff) | |
| parent | f7ca16604b567d19078a3edb7c9ba84ffa33a2dc (diff) | |
| download | otp-dc7a9868aa1259f729f8437d92a7948ba1098401.tar.gz otp-dc7a9868aa1259f729f8437d92a7948ba1098401.tar.bz2 otp-dc7a9868aa1259f729f8437d92a7948ba1098401.zip | |
Merge branch 'ia/ssh/inet-option/OTP-11976' into maint
* ia/ssh/inet-option/OTP-11976:
ssh: Handle inet and inet6 option correctly
Diffstat (limited to 'lib/ssh/doc/src/ssh.xml')
| -rw-r--r-- | lib/ssh/doc/src/ssh.xml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml index 5a141ced3c..876eba598a 100644 --- a/lib/ssh/doc/src/ssh.xml +++ b/lib/ssh/doc/src/ssh.xml @@ -4,7 +4,7 @@ <erlref> <header> <copyright> - <year>2004</year><year>2013</year> + <year>2004</year><year>2014</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -97,6 +97,8 @@ <seealso marker="ssh_connection#session_channel/2">ssh_connection:session_channel/[2, 4]</seealso>.</p> <p>Options are:</p> <taglist> + <tag><c><![CDATA[{inet, inet | inet6}]]></c></tag> + <item> IP version to use.</item> <tag><c><![CDATA[{user_dir, string()}]]></c></tag> <item> <p>Sets the user directory i.e. the directory containing @@ -230,6 +232,8 @@ port.</p> <p>Options are:</p> <taglist> + <tag><c><![CDATA[{inet, inet | inet6}]]></c></tag> + <item> IP version to use when the host address is specified as <c>any</c>. </item> <tag><c><![CDATA[{subsystems, [subsystem_spec()]]]></c></tag> <item> Provides specifications for handling of subsystems. The |