From a5f5feb9b4c4bedfa027b07e33a5d1ccc9fb240b Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Thu, 8 Aug 2019 13:37:05 +0200
Subject: ssh: Use new ssh_connection:event() type in channel defs

---
 lib/ssh/doc/src/ssh_client_channel.xml | 14 +++++++-------
 lib/ssh/doc/src/ssh_server_channel.xml |  8 ++++----
 lib/ssh/src/ssh_client_channel.erl     |  2 +-
 lib/ssh/src/ssh_server_channel.erl     |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/ssh/doc/src/ssh_client_channel.xml b/lib/ssh/doc/src/ssh_client_channel.xml
index cd28b95fd3..e6683dbd0b 100644
--- a/lib/ssh/doc/src/ssh_client_channel.xml
+++ b/lib/ssh/doc/src/ssh_client_channel.xml
@@ -150,12 +150,12 @@
 	  <tag><c>{init_args(), list()}</c></tag>
 	  <item><p>The list of arguments to the <c>init</c> function of the callback module.</p></item>
 
-	  <tag><c>{cm, ssh:connection_ref()}</c></tag>
+	  <tag><c>{cm, </c><seealso marker="ssh:ssh#type-connection_ref">ssh:connection_ref()</seealso><c>}</c></tag>
 	  <item><p>Reference to the <c>ssh</c> connection as returned by
 	  <seealso marker="ssh#connect-3">ssh:connect/3</seealso>.
 	  </p></item>
 	  
-	  <tag><c>{channel_id, ssh:channel_id()}</c></tag>
+	  <tag><c>{channel_id, </c><seealso marker="ssh:ssh#type-channel_id">ssh:channel_id()</seealso><c>}</c></tag>
 	  <item><p>Id of the <c>ssh</c> channel as returned by
 	  <seealso marker="ssh_connection#session_channel/2">ssh_connection:session_channel/2,4</seealso>.
 	  </p></item>
@@ -198,7 +198,7 @@
       {ok, ChannelRef} | {error, Reason}</name>
       <fsummary>Starts a process that handles an SSH channel.</fsummary>
       <type>
-	<v>SshConnection = ssh:connection_ref()</v>
+	<v>SshConnection = <seealso marker="ssh:ssh#type-connection_ref">ssh:connection_ref()</seealso></v>
 	<d>As returned by <seealso marker="ssh#connect-3">ssh:connect/3</seealso></d>
 
 	<v>ChannelId = <seealso marker="ssh#type-channel_id">ssh:channel_id()</seealso></v>
@@ -374,7 +374,7 @@
 	function and all channels are to handle the following message.</p>
 	
 	<taglist>
-	  <tag><c>{ssh_channel_up, ssh:channel_id(), ssh:connection_ref()}</c></tag>
+	  <tag><c>{ssh_channel_up, </c><seealso marker="ssh:ssh#type-channel_id">ssh:channel_id()</seealso><c>, </c><seealso marker="ssh:ssh#type-connection_ref">ssh:connection_ref()</seealso><c>}</c></tag>
 	  <item><p>This is the first message that the channel receives.
 	  It is sent just before the <seealso
 	  marker="#init-1">init/1</seealso> function
@@ -393,21 +393,21 @@
       ChannelId, State}</name>
       <fsummary>Handles <c>ssh</c> connection protocol messages.</fsummary>
       <type>
-	<v>Msg = ssh_connection:event()</v>
+	<v>Msg = <seealso marker="ssh_connection#type-event">ssh_connection:event()</seealso></v>
 	<v>ChannelId = <seealso marker="ssh#type-channel_id">ssh:channel_id()</seealso></v>
 	<v>State = term()</v>
       </type>
       <desc>
 	<p>Handles SSH Connection Protocol messages that may need
 	service-specific attention. For details,
-	see <seealso marker="ssh_connection"> ssh_connection:event()</seealso>.
+	see <seealso marker="ssh_connection#type-event">ssh_connection:event()</seealso>.
 	</p>
 	
 	<p>The following message is taken care of by the
 	<c>ssh_client_channel</c> behavior.</p>
 	
 	<taglist>
-	  <tag><c>{closed, ssh:channel_id()}</c></tag>
+	  <tag><c>{closed, </c><seealso marker="ssh:ssh#type-channel_id">ssh:channel_id()</seealso><c>}</c></tag>
 	  <item><p>The channel behavior sends a close message to the
 	  other side, if such a message has not already been sent.
 	  Then it terminates the channel with reason <c>normal</c>.</p></item>
diff --git a/lib/ssh/doc/src/ssh_server_channel.xml b/lib/ssh/doc/src/ssh_server_channel.xml
index a4e18bbfbf..87c745c9fb 100644
--- a/lib/ssh/doc/src/ssh_server_channel.xml
+++ b/lib/ssh/doc/src/ssh_server_channel.xml
@@ -112,7 +112,7 @@
 	function and all channels are to handle the following message.</p>
 	
 	<taglist>
-	  <tag><c>{ssh_channel_up, ssh:channel_id(), ssh:connection_ref()}</c></tag>
+	  <tag><c>{ssh_channel_up, </c><seealso marker="ssh:ssh#type-channel_id">ssh:channel_id()</seealso><c>, </c><seealso marker="ssh:ssh#type-connection_ref">ssh:connection_ref()</seealso><c>}</c></tag>
 	  <item><p>This is the first message that the channel receives.
 	  This is especially useful if the
 	  server wants to send a message to the client without first
@@ -129,21 +129,21 @@
       ChannelId, State}</name>
       <fsummary>Handles <c>ssh</c> connection protocol messages.</fsummary>
       <type>
-	<v>Msg = ssh_connection:event()</v>
+	<v>Msg = <seealso marker="ssh_connection#type-event">ssh_connection:event()</seealso></v>
 	<v>ChannelId = <seealso marker="ssh#type-channel_id">ssh:channel_id()</seealso></v>
 	<v>State = term()</v>
       </type>
       <desc>
 	<p>Handles SSH Connection Protocol messages that may need
 	service-specific attention. For details,
-	see <seealso marker="ssh_connection"> ssh_connection:event()</seealso>.
+	see <seealso marker="ssh_connection#type-event">ssh_connection:event()</seealso>.
 	</p>
 	
 	<p>The following message is taken care of by the
 	<c>ssh_server_channel</c> behavior.</p>
 	
 	<taglist>
-	  <tag><c>{closed, ssh:channel_id()}</c></tag>
+	  <tag><c>{closed, </c><seealso marker="ssh:ssh#type-channel_id">ssh:channel_id()</seealso><c>}</c></tag>
 	  <item><p>The channel behavior sends a close message to the
 	  other side, if such a message has not already been sent.
 	  Then it terminates the channel with reason <c>normal</c>.</p></item>
diff --git a/lib/ssh/src/ssh_client_channel.erl b/lib/ssh/src/ssh_client_channel.erl
index f985d8e273..3bd1e1fdf1 100644
--- a/lib/ssh/src/ssh_client_channel.erl
+++ b/lib/ssh/src/ssh_client_channel.erl
@@ -52,7 +52,7 @@
 -callback handle_msg(Msg ::term(), State :: term()) ->
     {ok, State::term()} | {stop, ChannelId::ssh:channel_id(), State::term()}. 
 
--callback handle_ssh_msg({ssh_cm, ConnectionRef::ssh:connection_ref(), SshMsg::term()}, 
+-callback handle_ssh_msg(ssh_connection:event(),
  			 State::term()) -> {ok, State::term()} | 
  					   {stop, ChannelId::ssh:channel_id(), 
  					    State::term()}.
diff --git a/lib/ssh/src/ssh_server_channel.erl b/lib/ssh/src/ssh_server_channel.erl
index 555080e9ee..1905c40c98 100644
--- a/lib/ssh/src/ssh_server_channel.erl
+++ b/lib/ssh/src/ssh_server_channel.erl
@@ -37,7 +37,7 @@
 
 -callback handle_msg(Msg ::term(), State :: term()) ->
     {ok, State::term()} | {stop, ChannelId::ssh:channel_id(), State::term()}. 
--callback handle_ssh_msg({ssh_cm, ConnectionRef::ssh:connection_ref(), SshMsg::term()},
+-callback handle_ssh_msg(ssh_connection:event(),
 			 State::term()) -> {ok, State::term()} |
 					   {stop, ChannelId::ssh:channel_id(),
 					    State::term()}.
-- 
cgit v1.2.3