From 08225797f7ef943d0c82a1d9dd6650d94ca2580d Mon Sep 17 00:00:00 2001 From: Niclas Eklund Date: Wed, 21 Apr 2010 10:42:46 +0000 Subject: New branch for ssh-2.0 and later --- lib/ssh/doc/src/book.xml | 6 +++--- lib/ssh/doc/src/notes.xml | 33 --------------------------------- lib/ssh/doc/src/ref_man.xml | 6 +++--- lib/ssh/doc/src/ssh.xml | 11 ++--------- lib/ssh/doc/src/ssh_sftp.xml | 6 +++--- lib/ssh/doc/src/ssh_sftpd.xml | 6 +++--- 6 files changed, 14 insertions(+), 54 deletions(-) (limited to 'lib/ssh/doc') diff --git a/lib/ssh/doc/src/book.xml b/lib/ssh/doc/src/book.xml index 0375c441af..fcec1d6f70 100644 --- a/lib/ssh/doc/src/book.xml +++ b/lib/ssh/doc/src/book.xml @@ -4,7 +4,7 @@
- 20052009 + 20052010 Ericsson AB. All Rights Reserved. @@ -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. - + SSH diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml index 0ce83fa5d1..9597137cdf 100644 --- a/lib/ssh/doc/src/notes.xml +++ b/lib/ssh/doc/src/notes.xml @@ -29,39 +29,6 @@ notes.xml
-
Ssh 1.1.9 - -
Fixed Bugs and Malfunctions - - -

The function ssh:connect/4 was not exported.

-

Own Id: OTP-8550 Aux Id:

- - -
- -
Improvements and New Features - - -

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

-

Own Id: OTP-8535 Aux Id:

- - -

The ssh_connection:send operation now accepts infinity as timeout.

-

Own Id: OTP-8534 Aux Id:

- - -

The connection handler now include stack traces when a channel - message is not handled correctly.

-

Own Id: OTP-8524 Aux Id:

- - -
- -
-
Ssh 1.1.8
Fixed Bugs and Malfunctions diff --git a/lib/ssh/doc/src/ref_man.xml b/lib/ssh/doc/src/ref_man.xml index c05c3051b0..9ab56b28ec 100644 --- a/lib/ssh/doc/src/ref_man.xml +++ b/lib/ssh/doc/src/ref_man.xml @@ -4,7 +4,7 @@
- 20042009 + 20042010 Ericsson AB. All Rights Reserved. @@ -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. - + SSH Reference Manual diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml index 71e6b2cd3d..1aea9e76d1 100644 --- a/lib/ssh/doc/src/ssh.xml +++ b/lib/ssh/doc/src/ssh.xml @@ -159,9 +159,6 @@

Allow an existing file-descriptor to be used (simply passed on to the transport protocol).

 - - -

Determines if SSH shall use IPv6 or not.

 @@ -201,8 +198,8 @@ Provides specifications for handling of subsystems. The "sftp" subsystem-spec can be retrieved by calling - ssh_sftpd:subsystem_spec/1. If the subsystems option in not present - the value of [ssh_sftpd:subsystem_spec([])] will be used. + ssh_sftd:subsystem_spec/1. If the subsystems option in not present + the value of [ssh_sftd:subsystem_spec([])] 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. @@ -255,10 +252,6 @@

Allow an existing file-descriptor to be used (simply passed on to the transport protocol).

 - - -

Determines if SSH shall use IPv6 or not (only used when - HostAddress is set to any).

 diff --git a/lib/ssh/doc/src/ssh_sftp.xml b/lib/ssh/doc/src/ssh_sftp.xml index 208b2b4e72..c1f75461b1 100644 --- a/lib/ssh/doc/src/ssh_sftp.xml +++ b/lib/ssh/doc/src/ssh_sftp.xml @@ -4,7 +4,7 @@
- 20052009 + 20052010 Ericsson AB. All Rights Reserved. @@ -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. - + ssh_sftp diff --git a/lib/ssh/doc/src/ssh_sftpd.xml b/lib/ssh/doc/src/ssh_sftpd.xml index c857983565..b3d64e72b4 100644 --- a/lib/ssh/doc/src/ssh_sftpd.xml +++ b/lib/ssh/doc/src/ssh_sftpd.xml @@ -4,7 +4,7 @@
- 20052009 + 20052010 Ericsson AB. All Rights Reserved. @@ -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. - + ssh_sftpd -- cgit v1.2.3