ssh: moved "supported" section from ssh module man page to SSH_app man page

2 files changed, 83 insertions, 27 deletions

diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index 0e5a0706f5..1e9acf4a99 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -32,34 +32,10 @@
   <modulesummary>Main API of the ssh application</modulesummary>
   <description>
     <p>Interface module for the <c>ssh</c> application.</p>
+    <p>See <seealso marker="ssh:SSH_app#supported">ssh(6)</seealso> for details of supported version,
+    algorithms and unicode support.</p>
   </description>
 
-   <section>
-    <title>SSH</title>
-    <marker id="supported"/>
-    <list type="bulleted">
-      <item>For application dependencies see <seealso marker="SSH_app"> ssh(6)</seealso> </item>
-      <item>Supported SSH version is 2.0.</item>
-      <item>Supported public key algorithms: ecdsa-sha2-nistp256, ecdsa-sha2-nistp384, ecdsa-sha2-nistp521, ssh-rsa and ssh-dss.</item>
-      <item>Supported MAC algorithms: hmac-sha2-256, hmac-sha2-512 and hmac-sha1.</item>
-      <item>Supported encryption algorithms: aes256-ctr, aes192-ctr, aes128-ctr, aes128-cb and 3des-cbc.</item>
-      <item>Supported key exchange algorithms: ecdh-sha2-nistp256, ecdh-sha2-nistp384, ecdh-sha2-nistp521, diffie-hellman-group14-sha1, diffie-hellman-group-exchange-sha1, diffie-hellman-group-exchange-sha256 and diffie-hellman-group1-sha1</item>
-      <item>Supported compression algorithms: none, [email protected] and zlib</item>
-      <item>Supports unicode filenames if the emulator and the underlaying OS support it.
-      See section DESCRIPTION in the
-      <seealso marker="kernel:file">file</seealso> manual page in <c>kernel</c>
-      for information about this subject.</item>
-      <item>Supports unicode in shell and CLI.</item>
-    </list>
-    <p>The actual set of algorithms can vary depending on which OpenSSL crypto library that is installed on the machine.
-    For the list on a particular installation, use the command <seealso marker="#default_algorithms/0">default_algorithms/0</seealso>. 
-    The user may override the default algorithm configuration both on the server side and the client side.
-    See the option preferred_algorithms in the <seealso marker="#daemon/1">daemon</seealso> and
-    <seealso marker="#connect/3">connect</seealso> functions.
-</p>
-    
-  </section>
-  
   <section>
     <title>OPTIONS</title>
     <p>The exact behaviour of some functions can be adjusted with the use of options which are documented together
diff --git a/lib/ssh/doc/src/ssh_app.xml b/lib/ssh/doc/src/ssh_app.xml
index 1ae1558607..f461f87d1b 100644
--- a/lib/ssh/doc/src/ssh_app.xml
+++ b/lib/ssh/doc/src/ssh_app.xml
@@ -52,7 +52,7 @@
     </p>
   </section>
 
-  <section>
+   <section>
     <title>CONFIGURATION</title>
 
     <p>The <c>ssh</c> application does not have an application-
@@ -120,6 +120,86 @@
   </section>
 
   <section>
+    <marker id="supported"/>
+    <title>SUPPORTED</title>
+    <p>The supported SSH version is 2.0.</p>
+
+    <title>Algorithms</title>
+    <p>The actual set of algorithms may vary depending on which OpenSSL crypto library that is installed on the machine.
+    For the list on a particular installation, use the command
+    <seealso marker="ssh:ssh#default_algorithms/0">ssh:default_algorithms/0</seealso>. 
+    The user may override the default algorithm configuration both on the server side and the client side.
+    See the option <c>preferred_algorithms</c> in the <seealso marker="ssh:ssh#daemon/1">ssh:daemon/1,2,3</seealso> and
+    <seealso marker="ssh:ssh#connect/3">ssh:connect/3,4</seealso> functions.
+    </p>
+
+    <p>Supported algorithms are:</p>
+
+    <taglist>
+      <tag>Public key algorithms</tag>
+      <item>
+	<list type="bulleted">
+	  <item>ecdsa-sha2-nistp256</item>
+	  <item>ecdsa-sha2-nistp384</item>
+	  <item>ecdsa-sha2-nistp521</item>
+	  <item>ssh-rsa</item>
+	  <item>ssh-dss</item>
+	</list>
+      </item>
+
+      <tag>MAC algorithms</tag>
+      <item>
+	<list type="bulleted">
+	  <item>hmac-sha2-256</item>
+	  <item>hmac-sha2-512</item>
+	  <item>hmac-sha1</item>
+	</list>
+      </item>
+
+      <tag>Encryption algorithms</tag>
+      <item>
+	<list type="bulleted">
+	  <item>aes128-ctr</item>
+	  <item>aes192-ctr</item>
+	  <item>aes256-ctr</item>
+	  <item>aes128-cbc</item>
+	  <item>3des-cbc</item>
+	</list>
+      </item>
+
+      <tag>Key exchange algorithms</tag>
+      <item>
+	<list type="bulleted">
+	  <item>ecdh-sha2-nistp256</item>
+	  <item>ecdh-sha2-nistp384</item>
+	  <item>ecdh-sha2-nistp521</item>
+	  <item>diffie-hellman-group-exchange-sha1</item>
+	  <item>diffie-hellman-group-exchange-sha256</item>
+	  <item>diffie-hellman-group14-sha1</item>
+	  <item>diffie-hellman-group1-sha1</item>
+	</list>
+      </item>
+
+      <tag>Compression algorithms</tag>
+      <item>
+	<list type="bulleted">
+	  <item>none</item>
+	  <item>[email protected]</item>
+	  <item>zlib</item>
+	</list>
+      </item>
+    </taglist>
+
+    <title>Unicode support</title>
+    <p>Unicode filenames are supported if the emulator and the underlaying OS support it. See section DESCRIPTION in the
+      <seealso marker="kernel:file">file</seealso> manual page in <c>kernel</c> for information about this subject.
+    </p>
+    <p>The shell and the cli support unicode.
+    </p>
+    
+  </section>
+
+  <section>
     <title>SEE ALSO</title>
     <p><seealso marker="kernel:application">application(3)</seealso></p>
   </section>