aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/doc/src
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2014-06-04 12:32:00 +0200
committerIngela Anderton Andin <[email protected]>2014-06-11 15:08:06 +0200
commitf7ca16604b567d19078a3edb7c9ba84ffa33a2dc (patch)
tree04c90ecf64d71d85856b26b7ca7720075e7f98d0 /lib/ssh/doc/src
parentfed8c2586a80c79951f994f24ba69c30bd8d262c (diff)
downloadotp-f7ca16604b567d19078a3edb7c9ba84ffa33a2dc.tar.gz
otp-f7ca16604b567d19078a3edb7c9ba84ffa33a2dc.tar.bz2
otp-f7ca16604b567d19078a3edb7c9ba84ffa33a2dc.zip
ssh: Handle inet and inet6 option correctly
Diffstat (limited to 'lib/ssh/doc/src')
-rw-r--r--lib/ssh/doc/src/ssh.xml6
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