From 20363d9af0f0f9446d3a1dfb099f4aa1898dc231 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20H=C3=A4ssler?= <mhssler@gmail.com>
Date: Mon, 14 Oct 2013 20:42:58 +0200
Subject: Fix ssh doc typos

ssh_rsa changed to 'ssh-rsa' and missing space added.
---
 lib/ssh/doc/src/ssh.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/ssh/doc')

diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index 141d3df38e..fb58a4b014 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -141,7 +141,7 @@
             <p>Sets the preferred public key algorithm to use for user
 	    authentication. If the the preferred algorithm fails for
 	    some reason, the other algorithm is tried. The  default is
-	    to try <c><![CDATA[ssh_rsa]]></c> first.</p>
+	    to try <c><![CDATA['ssh-rsa']]></c> first.</p>
 	  </item>
 	  <tag><c><![CDATA[{pref_public_key_algs, list()}]]></c></tag>
 	  <item>
@@ -248,7 +248,7 @@
 	    requested by the client. Default is to use the erlang shell:
 	    <c><![CDATA[{shell, start, []}]]></c>
 	  </item>
-	  <tag><c><![CDATA[{ssh_cli,{channel_callback(),
+	  <tag><c><![CDATA[{ssh_cli, {channel_callback(),
 	  channel_init_args()}}]]></c></tag>
 	  <item>
 	    Provides your own cli implementation, i.e. a channel callback
-- 
cgit v1.2.3


From d54e4318a77c7a42a7b8952780b33987775c7608 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Wed, 25 Sep 2013 14:56:19 +0200
Subject: ssh: Add function ssh:peername/1 with test

OTP-11345, sto575, tsk374
---
 lib/ssh/doc/src/ssh.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'lib/ssh/doc')

diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index fb58a4b014..ddfb50ebd2 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -333,6 +333,20 @@
       </desc>
     </func>
 
+    <func>
+      <name>peername(ConnectionRef) -> {ok, {Address,Port}} | {error,Error} </name>
+      <fsummary> </fsummary>
+      <type>
+	<v> ConnectionRef = ssh_connection_ref()</v>
+        <v> Address = ip_address()</v>
+	<v> Port = integer()</v>
+      </type>
+      <desc>
+        <p>Returns the address and port for the other end of a connection.
+	</p>
+      </desc>
+    </func>
+
     <func>
       <name>shell(Host) -> </name>
       <name>shell(Host, Option) -> </name>
-- 
cgit v1.2.3


From f5495aa1560daf65c063a8d5b99a5ea17520ea92 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Mon, 30 Sep 2013 16:35:09 +0200
Subject: ssh: Add ssh:sockname/1 incl doc and tests

OTP-11345, sto575, tsk374
---
 lib/ssh/doc/src/ssh.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'lib/ssh/doc')

diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index ddfb50ebd2..896b98edc2 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -366,6 +366,20 @@
       </desc>
     </func>
 
+    <func>
+      <name>sockname(ConnectionRef) -> {ok, {Address,Port}} | {error,Error} </name>
+      <fsummary> </fsummary>
+      <type>
+	<v> ConnectionRef = ssh_connection_ref()</v>
+        <v> Address = ip_address()</v>
+	<v> Port = integer()</v>
+      </type>
+      <desc>
+        <p>Returns the local address and port number for a connection.
+	</p>
+      </desc>
+    </func>
+
     <func>
       <name>start() -> </name>
       <name>start(Type) -> ok | {error, Reason}</name>
-- 
cgit v1.2.3


From d27003ba5c5ce962df439a99076a85607b82d746 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <tristan@heroku.com>
Date: Thu, 5 Sep 2013 17:43:05 -0500
Subject: fix private_key type documentation in ssh_server_key_api

---
 lib/ssh/doc/src/ssh_server_key_api.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib/ssh/doc')

diff --git a/lib/ssh/doc/src/ssh_server_key_api.xml b/lib/ssh/doc/src/ssh_server_key_api.xml
index c4562e1211..51e1fc1f2e 100644
--- a/lib/ssh/doc/src/ssh_server_key_api.xml
+++ b/lib/ssh/doc/src/ssh_server_key_api.xml
@@ -29,7 +29,7 @@
     -behaviour(ssh_server_key_api).
   </modulesummary>
   <description>
-    <p>  Behaviour describing the API for an SSH server's public key handling.By implementing the callbacks defined
+    <p>  Behaviour describing the API for an SSH server's public key handling. By implementing the callbacks defined
     in this behavior it is possible to customize the SSH server's public key
     handling. By default the SSH application implements this behavior
     with help of the standard openssh files, see <seealso marker="SSH_app"> ssh(6)</seealso>.</p>
@@ -44,9 +44,9 @@
 
     <p> boolean() = true | false</p>
     <p> string() = [byte()]</p>
-    <p> public_key() =  #'RSAPublicKey'{}| {integer(),  #'Dss-Parms'{}}| term()</p>
-    <p> private_key() =  #'RSAPublicKey'{}| {integer(),  #'Dss-Parms'{}}| term()</p>
-    <p> public_key_algorithm() =  'ssh-rsa'| 'ssh-dss' | atom()</p>
+    <p> public_key() =  #'RSAPublicKey'{} | {integer(),  #'Dss-Parms'{}} | term()</p>
+    <p> private_key() =  #'RSAPrivateKey'{} | #'DSAPrivateKey'{} | term()</p>
+    <p> public_key_algorithm() =  'ssh-rsa' | 'ssh-dss' | atom()</p>
   </section>
 
   <funcs>
@@ -56,7 +56,7 @@
       <fsummary>Fetches the hosts private key </fsummary>
       <type>
 	<v>Algorithm = public_key_algorithm()</v>
-	<d> Host key algorithm. Should support 'ssh-rsa'| 'ssh-dss' but additional algorithms
+	<d> Host key algorithm. Should support 'ssh-rsa' | 'ssh-dss' but additional algorithms
 	can be handled.</d>
 	<v> DaemonOptions = proplists:proplist() </v>
 	<d>Options provided to  <seealso marker="ssh#daemon-2">ssh:daemon/[2,3]</seealso></d>
-- 
cgit v1.2.3