updates per Sam Freed for remote connections

Author: mikeblome

docs/linux/connect-to-your-remote-linux-computer.md

@@ -19,20 +19,10 @@ You can configure a Linux project to target a remote machine or to Windows Subsy
 
 ## Connect to a remote Linux computer
 
-When building a C++ Linux project for a remote Linux system (VM or physical machine), Linux code is copied to your remote Linux computer and then compiled based on Visual Studio settings. (In Visual Studio 2017, use these instructions to connect to WSL also. Use **localhost** for the **Host Name**.)
+When building a C++ Linux project for a remote Linux system (VM or physical machine), Linux code is copied to your remote Linux computer and then compiled based on Visual Studio settings.
 
 To set up this remote connection:
 
-1. Create a private key file (or [reuse an existing one](https://security.stackexchange.com/questions/10203/reusing-private-public-keys)). Currently only RSA and DSA keys are supported. You can create a private RSA key file by following these steps:
-
-    1. On the Windows machine, create the ssh key pair with `ssh-keygen -t rsa` 
-
-    1. From Windows, copy the public key to the Linux machine: `scp -p C:\Users\<USERNAME>\.ssh\id_rsa.pub user@hostname`:
-
-    1. On the Linux system, add the key to the list of authorized keys (and ensure the file has the correct permissions): `cat ~/id_rsa.pub >> ~/.ssh/authorized_keys; chmod 600 ~/.ssh/authorized_keys`
-
-    1. In Visual Studio, add the connection (in Connection Manager). The default private key name is `C:\Users\<USERNAME>\.ssh\id_rsa`.
-
 1. Build the project for the first time or manually create a new entry by selecting **Tools > Options** and then open the **Cross Platform > Connection Manager** node and click the **Add** button.
 
    ![Connection Manager](media/settings_connectionmanager.png)
@@ -53,7 +43,16 @@ To set up this remote connection:
    | **Private key file**    | Private key file created for ssh connection
    | **Passphrase**          | Passphrase used with private key selected above
 
+   You can use either a password or key file and passphrase for authentication. For many development scenarios, password authentication is sufficient. If you prefer to use a public/private key file, you can create a new one or [reuse an existing one](https://security.stackexchange.com/questions/10203/reusing-private-public-keys). Currently only RSA and DSA keys are supported. 
 
+   You can create a private RSA key file by following these steps:
+
+    1. On the Windows machine, create the ssh key pair with `ssh-keygen -t rsa`. This will create a public key and a private key. By default the keys are placed under `C:\Users\%USERNAME%\.ssh` with names `id_rsa.pub` and `id_rsa`."
+
+    1. From Windows, copy the public key to the Linux machine: `scp -p C:\Users\%USERNAME%\.ssh\id_rsa.pub user@hostname`:
+
+    1. On the Linux system, add the key to the list of authorized keys (and ensure the file has the correct permissions): `cat ~/id_rsa.pub >> ~/.ssh/authorized_keys; chmod 600 ~/.ssh/authorized_keys`
+
 1. Click the **Connect** button to attempt a connection to the remote computer. 
 
    If the connection succeeds, Visual Studio will begin configuring IntelliSense to use the remote headers. For more information, see [IntelliSense for headers on remote systems](configure-a-linux-project.md#remote_intellisense).
@@ -62,6 +61,8 @@ To set up this remote connection:
 
    ![Connection Manager Error](media/settings_connectionmanagererror.png)
 
+   If you are using key files for authentication, ensure the target machine's SSH server is running and configured properly.
+
    ::: moniker-end
 
    ::: moniker range="vs-2019"
@@ -76,6 +77,14 @@ To set up this remote connection:
 
 ## Connect to WSL
 
+::: moniker range="vs-2017"
+
+In Visual Studio 2017, you connect to WSL by using the same steps as connecting to a remote Linux machine as described earlier in this article. Use **localhost** for the **Host Name**.
+
+::: moniker-end
+
+::: moniker range="vs-2019"
+
 In Visual Studio 2019 version 16.1, it is not necessary to add a remote connection or configure SSH when targeting WSL. All that is required on the Linux system is gcc, gdb, make, rsync, and zip. Visual Studio requires rsync and zip only to extract header files on first use from your WSL instance to the Windows filesystem to use for IntelliSense. In Visual Studio 2019 version 16.1, WSL support is based on Windows version 1809. You can be running a later version of Windows, but Visual Studio does not yet take advantage of new WSL capabilities.
 
 If your distro supports apt, you can install the required packages with this command: