From d5fa5e53b882cd9849034399ac769d2b7e7d3179 Mon Sep 17 00:00:00 2001
From: Niclas Eklund <nick@erlang.org>
Date: Fri, 28 May 2010 12:00:00 +0200
Subject: ssh: Patch 1119

    OTP-8550  The function ssh:connect/4 was not exported.

    OTP-8644  Aligned error message with used version (SSH_FX_FAILURE
              vs SSH_FX_NOT_A_DIRECTORY, the latter introduced in version
              6).

    OTP-8645  Resolved race condition when another connection is started
              before a channel is opened in the first connection.

    OTP-8535  The configuration parameter ip_v6_disabled is now available,
              which makes it possible for the user to alter the IP version
              SSH shall use.

    OTP-8534  The ssh_connection:send operation now accepts infinity as
              timeout.

    OTP-8524  The connection handler now include stack traces when a channel
              message is not handled correctly.
---
 lib/ssh/doc/src/notes.xml | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 lib/ssh/doc/src/ssh.xml   | 17 ++++++++++++-----
 2 files changed, 59 insertions(+), 5 deletions(-)

(limited to 'lib/ssh/doc')

diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 9597137cdf..1e4870c8fb 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -29,6 +29,53 @@
     <file>notes.xml</file>
   </header>
 
+ <section><title>Ssh 1.1.9</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>The function ssh:connect/4 was not exported.</p>
+          <p>Own Id: OTP-8550 Aux Id:</p>
+        </item>
+        <item>
+          <p>Aligned error message with used version (SSH_FX_FAILURE vs 
+             SSH_FX_NOT_A_DIRECTORY, the latter introduced in version 6).</p>
+          <p>
+            *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>Own Id: OTP-8644 Aux Id: seq11574</p>
+        </item>
+        <item>
+          <p>Resolved race condition when another connection is started
+             before a channel is opened in the first connection.</p>
+          <p>Own Id: OTP-8645 Aux Id: seq11577</p>
+        </item>
+      </list>
+    </section>
+
+    <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>
+            *** POTENTIAL INCOMPATIBILITY ***</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>
+        <item>
+          <p>The connection handler now include stack traces when a channel 
+             message is not handled correctly.</p>
+          <p>Own Id: OTP-8524 Aux Id:</p>
+        </item>
+      </list>
+    </section>
+
+ </section>
+
  <section><title>Ssh 1.1.8</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index aca5c9cdc4..71e6b2cd3d 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>2009</year>
+      <year>2004</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,12 +13,12 @@
       compliance with the License. You should have received a copy of the
       Erlang Public License along with this software. If not, it can be
       retrieved online at http://www.erlang.org/.
-    
+
       Software distributed under the License is distributed on an "AS IS"
       basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
       the License for the specific language governing rights and limitations
       under the License.
-    
+
     </legalnotice>
     
     <title>ssh</title>
@@ -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>
@@ -198,8 +201,8 @@
 	  <item>
 	    Provides specifications for handling of subsystems.  The
 	    "sftp" subsystem-spec can be retrieved by calling
-	    ssh_sftd:subsystem_spec/1. If the subsystems option in not present
-	    the value of <c>[ssh_sftd:subsystem_spec([])]</c> will be used.
+	    ssh_sftpd:subsystem_spec/1. If the subsystems option in not present
+	    the value of <c>[ssh_sftpd:subsystem_spec([])]</c> will be used.
 	    It is of course possible to set the option to the empty list
 	    if you do not want the daemon to run any subsystems at all.
 	  </item>
@@ -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>
-- 
cgit v1.2.3