diff options
| author | Hans Nilsson <[email protected]> | 2016-06-01 11:47:52 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2016-06-01 11:47:52 +0200 |
| commit | 317079a89bdf69888e398cb7e5703bfda7bd2c74 (patch) | |
| tree | 82e0a323967b1506eb21cc0ec652476e4c3933ac /lib/ssh/doc/src/ssh.xml | |
| parent | b2cefac14a6b26c78f584592801413611ff6f31c (diff) | |
| parent | 84051a76ee4c07f7453ba2bf24fe32c8cf8c7b48 (diff) | |
| download | otp-317079a89bdf69888e398cb7e5703bfda7bd2c74.tar.gz otp-317079a89bdf69888e398cb7e5703bfda7bd2c74.tar.bz2 otp-317079a89bdf69888e398cb7e5703bfda7bd2c74.zip | |
Merge branch 'hans/ssh/use_open_socket_client/OTP-12860'
Diffstat (limited to 'lib/ssh/doc/src/ssh.xml')
| -rw-r--r-- | lib/ssh/doc/src/ssh.xml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml index ff2d6e082a..bd330e479f 100644 --- a/lib/ssh/doc/src/ssh.xml +++ b/lib/ssh/doc/src/ssh.xml @@ -124,9 +124,11 @@ </func> <func> + <name>connect(TcpSocket, Options) -> </name> + <name>connect(TcpSocket, Options, Timeout) -> </name> <name>connect(Host, Port, Options) -> </name> - <name>connect(Host, Port, Options, Timeout) -> {ok, - ssh_connection_ref()} | {error, Reason}</name> + <name>connect(Host, Port, Options, Timeout) -> + {ok, ssh_connection_ref()} | {error, Reason}</name> <fsummary>Connects to an SSH server.</fsummary> <type> <v>Host = string()</v> @@ -137,6 +139,8 @@ <v>Timeout = infinity | integer()</v> <d>Negotiation time-out in milli-seconds. The default value is <c>infinity</c>. For connection time-out, use option <c>{connect_timeout, timeout()}</c>.</d> + <v>TcpSocket = port()</v> + <d>The socket is supposed to be from <c>gen_tcp:connect</c> with option <c>{active,false}</c></d> </type> <desc> <p>Connects to an SSH server. No channel is started. This is done |