aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/doc
diff options
context:
space:
mode:
authorNiclas Eklund <nick@erlang.org>2010-03-22 14:22:24 +0000
committerErlang/OTP <otp@erlang.org>2010-03-22 14:22:24 +0000
commit835dba95f810cc925ac856171014b9dbea8c90be (patch)
tree9379ad0310e74f041a13a8742356c43a96085f2e /lib/ssh/doc
parent2fc7c367942b893beae1d572c6bcda78fe28c378 (diff)
downloadotp-835dba95f810cc925ac856171014b9dbea8c90be.tar.gz
otp-835dba95f810cc925ac856171014b9dbea8c90be.tar.bz2
otp-835dba95f810cc925ac856171014b9dbea8c90be.zip
Fix usage of ip_v6_disabled and publish it
Diffstat (limited to 'lib/ssh/doc')
-rw-r--r--lib/ssh/doc/src/notes.xml6
-rw-r--r--lib/ssh/doc/src/ssh.xml7
2 files changed, 13 insertions, 0 deletions
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 6ea7f099b3..2533ab8085 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -34,6 +34,12 @@
<section><title>Improvements and New Features</title>
<list>
<item>
+ <p>The configuration parameter ip_v6_disabled is now available,
+ which makes it possible for the user to alter the IP version
+ SSH shall use.</p>
+ <p>Own Id: OTP-8535 Aux Id:</p>
+ </item>
+ <item>
<p>The ssh_connection:send operation now accepts infinity as timeout.</p>
<p>Own Id: OTP-8534 Aux Id:</p>
</item>
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index 60150f0d37..71e6b2cd3d 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -159,6 +159,9 @@
<item>
<p>Allow an existing file-descriptor to be used
(simply passed on to the transport protocol).</p></item>
+ <tag><c><![CDATA[{ip_v6_disabled, boolean()}]]></c></tag>
+ <item>
+ <p>Determines if SSH shall use IPv6 or not.</p></item>
</taglist>
</desc>
</func>
@@ -252,6 +255,10 @@
<item>
<p>Allow an existing file-descriptor to be used
(simply passed on to the transport protocol).</p></item>
+ <tag><c><![CDATA[{ip_v6_disabled, boolean()}]]></c></tag>
+ <item>
+ <p>Determines if SSH shall use IPv6 or not (only used when
+ HostAddress is set to any).</p></item>
</taglist>
</desc>
</func>