diff options
author | Hans Nilsson <[email protected]> | 2018-04-27 10:31:01 +0200 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2018-04-27 10:31:01 +0200 |
commit | 82ac72abf72c25fb092486e50ddac700bec17341 (patch) | |
tree | 06b0de823c66c64ade945049d30c5cbda854bd9f /lib/ssh/doc/src/ssh.xml | |
parent | 56e88f364a32b471b03e2364c2eb84783642ad88 (diff) | |
parent | c2ca477c85e0e88732f634ddfb01ac675a97dddb (diff) | |
download | otp-82ac72abf72c25fb092486e50ddac700bec17341.tar.gz otp-82ac72abf72c25fb092486e50ddac700bec17341.tar.bz2 otp-82ac72abf72c25fb092486e50ddac700bec17341.zip |
Merge branch 'hans/ssh/channel_maintenance/OTP-15041'
* hans/ssh/channel_maintenance/OTP-15041:
ssh: ssh_channel replaced by ssh_client_channel
ssh: ssh_daemon_channel replaced by ssh_server_channel
ssh: Use ssh_daemon_channel_sup and ssh_damon_channel
ssh: Create doc for the ssh_daemon_channel behaviour
Diffstat (limited to 'lib/ssh/doc/src/ssh.xml')
-rw-r--r-- | lib/ssh/doc/src/ssh.xml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml index 03078cfd83..0223831cb1 100644 --- a/lib/ssh/doc/src/ssh.xml +++ b/lib/ssh/doc/src/ssh.xml @@ -68,8 +68,8 @@ <seealso marker="ssh_sftp#start_channel/1">ssh_sftp:start_channel/1,2,3</seealso>. </p> <p>To write your own client channel handler, use the behaviour - <seealso marker="ssh_channel">ssh_channel</seealso>. For own server channel handlers use the ssh_daemon_channel - behaviour: see the <seealso marker="ssh_channel#ssh_daemon_channel">note in ssh_channel</seealso>. + <seealso marker="ssh_client_channel">ssh_client_channel</seealso>. For server channel handlers use + <seealso marker="ssh_server_channel">ssh_server_channel</seealso> behaviour (replaces ssh_daemon_channel). </p> <p>Both clients and daemons accepts options that controls the exact behaviour. Some options are common to both. The three sets are called @@ -378,7 +378,8 @@ <p>The <c>subsystem_name</c> is the name that a client requests to start with for example <seealso marker="ssh_connection#subsystem/4">ssh_connection:subsystem/4</seealso>. </p> - <p>The <c>channel_callback</c> is the module that implements the <c>ssh_daemon_channel</c> + <p>The <c>channel_callback</c> is the module that implements the + <seealso marker="ssh_server_channel">ssh_server_channel</seealso> (replaces ssh_daemon_channel) behaviour in the daemon. See the section <seealso marker="using_ssh#usersguide_creating_a_subsystem">Creating a Subsystem</seealso> in the User's Guide for more information and an example. |