From c37c4814295aedfc416ec8739bd1b8af8425bace Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Wed, 7 Nov 2018 15:00:54 +0100
Subject: ssh: Fix documentation for public key in ext_info

---
 lib/ssh/doc/src/ssh.xml | 32 ++++++++++++++++----------------
 lib/ssh/src/ssh.hrl     |  7 +++----
 2 files changed, 19 insertions(+), 20 deletions(-)

(limited to 'lib')

diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index e31d630ebf..8435fced11 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -182,22 +182,6 @@
       </desc>
     </datatype>
 
-    <datatype>
-      <name name="pref_public_key_algs_client_option"/>
-      <desc>
-        <p>List of user (client) public key algorithms to try to use.</p>
-	<p>The default value is the <c>public_key</c> entry in the list returned by
-	<seealso marker="#default_algorithms/0">ssh:default_algorithms/0</seealso>.
-	</p>
-	<p>If there is no public key of a specified type available, the corresponding entry is ignored.
-	Note that the available set is dependent on the underlying cryptolib and current user's public keys.
-	</p>
-        <p>See also the option <seealso marker="ssh_file#type-user_dir_common_option"><c>user_dir</c></seealso>
-        for specifying the path to the user's keys.
-	</p>
-      </desc>
-    </datatype>
-
     <datatype>
       <name name="host_accepting_client_options"/>
       <name name="accept_hosts"/>
@@ -793,6 +777,22 @@
       </desc>
     </datatype>
 
+    <datatype>
+      <name name="pref_public_key_algs_common_option"/>
+      <desc>
+        <p>List of user (client) public key algorithms to try to use.</p>
+	<p>The default value is the <c>public_key</c> entry in the list returned by
+	<seealso marker="#default_algorithms/0">ssh:default_algorithms/0</seealso>.
+	</p>
+	<p>If there is no public key of a specified type available, the corresponding entry is ignored.
+	Note that the available set is dependent on the underlying cryptolib and current user's public keys.
+	</p>
+        <p>See also the option <seealso marker="ssh_file#type-user_dir_common_option"><c>user_dir</c></seealso>
+        for specifying the path to the user's keys.
+	</p>
+      </desc>
+    </datatype>
+
     <datatype>
       <name name="disconnectfun_common_option"/>
       <desc>
diff --git a/lib/ssh/src/ssh.hrl b/lib/ssh/src/ssh.hrl
index 233f3caa5d..f645201c4f 100644
--- a/lib/ssh/src/ssh.hrl
+++ b/lib/ssh/src/ssh.hrl
@@ -182,6 +182,7 @@
       | ssh_msg_debug_fun_common_option()
       | rekey_limit_common_option()
       | id_string_common_option()
+      | pref_public_key_algs_common_option()
       | preferred_algorithms_common_option()
       | modify_algorithms_common_option()
       | auth_methods_common_option()
@@ -209,6 +210,7 @@
         {ssh_msg_debug_fun, fun((ssh:connection_ref(),AlwaysDisplay::boolean(),Msg::binary(),LanguageTag::binary()) -> any()) } .
 
 -type id_string_common_option()           :: {id_string,  string() | random | {random,Nmin::pos_integer(),Nmax::pos_integer()} }.
+-type pref_public_key_algs_common_option() :: {pref_public_key_algs, [pubkey_alg()] } .
 -type preferred_algorithms_common_option():: {preferred_algorithms, algs_list()}.
 -type modify_algorithms_common_option()   :: {modify_algorithms,    modify_algs_list()}.
 -type auth_methods_common_option()        :: {auth_methods,         string() }.
@@ -227,8 +229,7 @@
 
 
 -type client_option()         ::
-        pref_public_key_algs_client_option()
-      | ssh_file:pubkey_passphrase_client_options()
+        ssh_file:pubkey_passphrase_client_options()
       | host_accepting_client_options()
       | authentication_client_options()
       | diffie_hellman_group_exchange_client_option()
@@ -242,8 +243,6 @@
         {keyboard_interact_fun, fun((term(),term(),term()) -> term())}
         | opaque_common_options().
 
--type pref_public_key_algs_client_option() :: {pref_public_key_algs, [pubkey_alg()] } .
-
 -type host_accepting_client_options() ::
         {silently_accept_hosts, accept_hosts()}
       | {user_interaction,     boolean()}
-- 
cgit v1.2.3