From fa2df5f9acf69803f1f15c799582aa5222c87a38 Mon Sep 17 00:00:00 2001
From: James Wells <james_wells@users.sourceforge.net>
Date: Mon, 24 Apr 2017 18:34:41 -0700
Subject: [PATCH 1/3] #929 -- Very basic command alias for SSH and SCP.

---
 tool/tsh/main.go | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/tool/tsh/main.go b/tool/tsh/main.go
index 02b803d7849..ee7a3b0d92f 100644
--- a/tool/tsh/main.go
+++ b/tool/tsh/main.go
@@ -22,8 +22,19 @@ import (
 
 import (
 	"os"
+	"path"
 )
 
 func main() {
-	common.Run(os.Args[1:], false)
+	cmd_line_orig := os.Args[1:]
+	cmd_line := []string{}
+	switch path.Base(os.Args[0]) {
+	case "ssh":
+		cmd_line = append([]string{"ssh"}, cmd_line_orig...)
+	case "scp":
+		cmd_line = append([]string{"scp"}, cmd_line_orig...)
+	default:
+		cmd_line = cmd_line_orig
+	}
+	common.Run(cmd_line, false)
 }

From a69e61c39d15d77bb312c69665b9494407a2a115 Mon Sep 17 00:00:00 2001
From: Ev Kontsevoy <ev@kontsevoy.com>
Date: Fri, 9 Jun 2017 21:51:16 -0700
Subject: [PATCH 2/3] Added some comments

---
 tool/tsh/main.go | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tool/tsh/main.go b/tool/tsh/main.go
index ee7a3b0d92f..28141acf3fe 100644
--- a/tool/tsh/main.go
+++ b/tool/tsh/main.go
@@ -16,18 +16,19 @@ limitations under the License.
 
 package main
 
-import (
-	"github.com/gravitational/teleport/tool/tsh/common"
-)
-
 import (
 	"os"
 	"path"
+
+	"github.com/gravitational/teleport/tool/tsh/common"
 )
 
 func main() {
 	cmd_line_orig := os.Args[1:]
 	cmd_line := []string{}
+
+	// lets see: if the executable name is 'ssh' or 'scp' we convert
+	// that to "tsh ssh" or "tsh scp"
 	switch path.Base(os.Args[0]) {
 	case "ssh":
 		cmd_line = append([]string{"ssh"}, cmd_line_orig...)

From ec02ed3c12f7bbea33e41563dbbb3a397ae6c3b4 Mon Sep 17 00:00:00 2001
From: Russell Jones <russell.valerius.jones@gmail.com>
Date: Mon, 12 Jun 2017 12:06:02 -0700
Subject: [PATCH 3/3] Updated incorrect KEX names.

---
 docs/2.0/admin-guide.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/2.0/admin-guide.md b/docs/2.0/admin-guide.md
index ed91bc4c0e2..22ebde44f5f 100644
--- a/docs/2.0/admin-guide.md
+++ b/docs/2.0/admin-guide.md
@@ -203,12 +203,12 @@ teleport:
     # Key exchange algorithms that the server supports. This section only needs
     # to be set if you want to override the defaults.
     kex_algos:
-      - kexAlgoCurve25519SHA256
-      - kexAlgoECDH256
-      - kexAlgoECDH384
-      - kexAlgoECDH521
-      - kexAlgoDH14SHA1
-      - kexAlgoDH1SHA1
+      - curve25519-sha256@libssh.org
+      - ecdh-sha2-nistp256
+      - ecdh-sha2-nistp384
+      - ecdh-sha2-nistp521
+      - diffie-hellman-group14-sha1
+      - diffie-hellman-group1-sha1
 
     # Message authentication code (MAC) algorithms that the server supports.
     # This section only needs to be set if you want to override the defaults.