Updates per review

Colin Robertson · Colin Robertson · commit 2fc48d1f65b7 · 2020-01-21T13:11:44.000-08:00
diff --git a/docs/linux/connect-to-your-remote-linux-computer.md b/docs/linux/connect-to-your-remote-linux-computer.md
@@ -11,9 +11,19 @@ Linux support is available in Visual Studio 2017 and later.
 
 ::: moniker-end
 
-::: moniker range=">=vs-2017"
+::: moniker range="vs-2017"
+
+You can configure a Linux project to target a remote machine or the Windows Subsystem for Linux (WSL). For both remote machines and for WSL, you need to set up a remote connection in Visual Studio 2017.
+
+::: moniker-end
+
+::: moniker range="vs-2019"
+
+You can configure a Linux project to target a remote machine or the Windows Subsystem for Linux (WSL). For a remote machine, you need to set up a remote connection in Visual Studio. To connect to WSL, skip ahead to the [Connect to WSL](#connect-to-wsl) section.
+
+::: moniker-end
 
-You can configure a Linux project to target a remote machine or the Windows Subsystem for Linux (WSL). For both remote machines and for WSL, you need to set up a remote connection in Visual Studio.
+::: moniker range=">=vs-2017"
 
 When using a remote connection, Visual Studio builds C++ Linux projects on the remote machine. It doesn't matter if it's a physical machine, a VM in the cloud, or WSL.
 To build the project, Visual Studio copies the source code to your remote Linux computer. Then, the code gets compiled based on Visual Studio settings.
@@ -88,6 +98,8 @@ If ssh isn't already set up and running on your Linux system, follow these steps
 
    ::: moniker range="vs-2019"
 
+## Logging for remote connections
+
    You can enable logging to help troubleshoot connection problems. On the menu bar, select **Tools > Options**. In the **Options** dialog, select **Cross Platform > Logging**:
 
    ![Remote Logging](media/remote-logging-vs2019.png)
@@ -98,7 +110,7 @@ If ssh isn't already set up and running on your Linux system, follow these steps
 
 ## Command-line utility for the Connection Manager  
 
-**Visual Studio 2019 version 16.5 or later**: ConnectionManager.exe is a command-line utility to manage remote development connections outside of Visual Studio. It's useful for tasks such as provisioning a new development machine. Or, you can use it to set up Visual Studio for continuous integration. For examples and a complete reference to the ConnectionManager command, see [ConnectionManager reference](../build/reference/connectionmanager-reference.md).  
+**Visual Studio 2019 version 16.5 or later**: ConnectionManager.exe is a command-line utility to manage remote development connections outside of Visual Studio. It's useful for tasks such as provisioning a new development machine. Or, you can use it to set up Visual Studio for continuous integration. For examples and a complete reference to the ConnectionManager command, see [ConnectionManager reference](connectionmanager-reference.md).  
 
 ::: moniker-end
 
diff --git a/docs/linux/connectionmanager-reference.md b/docs/linux/connectionmanager-reference.md
@@ -16,7 +16,7 @@ ConnectionManager.exe is available in Visual Studio 2019 version 16.5 and later.
 
 ConnectionManager.exe is a command-line utility to manage remote development connections outside of Visual Studio. It's useful for tasks such as provisioning a new development machine. Or, use it to set up Visual Studio for continuous integration. You can use it in a Developer Command Prompt window. For more information about the Developer Command Prompt, see [Use the Microsoft C++ toolset from the command line](..\building-on-the-command-line.md).
 
-ConnectionManager.exe is available in Visual Studio 2019 version 16.5 and later. It's installed automatically when you choose the **Connection Manager** component in the Visual Studio Installer. By default, it's installed in *%VCIDEInstallDir%\\Linux\\bin\\ConnectionManager.exe*.
+ConnectionManager.exe is available in Visual Studio 2019 version 16.5 and later. It's part of the **Linux development with C++** workload in the Visual Studio Installer. It's also installed automatically when you choose the **Connection Manager** component in the installer. It's installed in *%VCIDEInstallDir%\\Linux\\bin\\ConnectionManagerExe\\ConnectionManager.exe*.
 
 The functionality of ConnectionManager.exe is also available in Visual Studio. To manage remote development connections in the IDE, on the menu bar, choose **Tools** > **Options** to open the Options dialog. In the Options dialog, select **Cross Platform** > **Connection Manager**.
 
@@ -26,11 +26,11 @@ The functionality of ConnectionManager.exe is also available in Visual Studio. T
 
 ### Commands and arguments
 
-- **add** *user@host* \[**--port** *port*] \[**--password** *password*] \[**--privatekey** *privatekey_file*]
+- **add** *user\@host* \[**--port** *port*] \[**--password** *password*] \[**--privatekey** *privatekey_file*]
 
   Authenticates and adds a new connection. By default, it uses port 22 and password authentication. (You'll be prompted to enter a password.) Use both **--password** and **--privatekey** to specify a password for a private key.
 
-- **remove** \[*connection_id* \| *user@host* \[**--port** *port*]]
+- **remove** \[*connection_id* \| *user\@host* \[**--port** *port*]]
 
   Removes a connection. If no arguments are specified, you're prompted to specify which connection to remove.
 
diff --git a/docs/linux/set-up-fips-compliant-secure-remote-linux-development.md b/docs/linux/set-up-fips-compliant-secure-remote-linux-development.md
@@ -15,7 +15,7 @@ Linux support is available in Visual Studio 2017 and later. FIPS-compliant secur
 
 Federal Information Processing Standard (FIPS) Publication 140-2 is a U.S. government standard for cryptographic modules. Implementations of the standard are validated by NIST. Windows has [validated support for FIPS-compliant cryptographic modules](/windows/security/threat-protection/fips-140-validation). In Visual Studio 2019 version 16.5 and later, you can use a secure, FIPS-compliant cryptographic connection to your Linux system for remote development.
 
-To set up a secure, FIPS-compliant connection between Visual Studio and your remote Linux system, follow this guide. It's applicable when you build CMake or MSBuild Linux projects in Visual Studio. This article is the FIPS-compliant version of the connection instructions in [Connect to your remote Linux computer](connect-to-your-remote-linux-computer.md).
+Here's how to set up a secure, FIPS-compliant connection between Visual Studio and your remote Linux system. This guide is applicable when you build CMake or MSBuild Linux projects in Visual Studio. This article is the FIPS-compliant version of the connection instructions in [Connect to your remote Linux computer](connect-to-your-remote-linux-computer.md).
 
 ## Prepare a FIPS-compliant connection
 
@@ -48,9 +48,9 @@ The examples in this article use Ubuntu 18.04 LTS with OpenSSH server version 7.
    ```
 
    > [!NOTE]
-   > ssh-rsa is the only FIPS compliant host key algorithm VS supports. aes*-ctr is also FIPS compliant, but the implementation in Visual Studio isn't approved. ecdh-* key exchange algorithms are FIPS compliant but Visual Studio doesn't support them.
+   > ssh-rsa is the only FIPS compliant host key algorithm VS supports. The aes\*-ctr algorithms are also FIPS compliant, but the implementation in Visual Studio isn't approved. The ecdh-\* key exchange algorithms are FIPS compliant, but Visual Studio doesn't support them.
 
-   Some other relevant security options you may want to consider are `PermitRootLogin`, `PasswordAuthentication`, and `PermitEmptyPasswords`. For more information, see the man page for sshd_config or the article [SSH Server Configuration](https://www.ssh.com/ssh/sshd_config).
+   You're not limited to these options. You can configure ssh to use additional ciphers, host key algorithms, and so on. Some other relevant security options you may want to consider are `PermitRootLogin`, `PasswordAuthentication`, and `PermitEmptyPasswords`. For more information, see the man page for sshd_config or the article [SSH Server Configuration](https://www.ssh.com/ssh/sshd_config).
 
 1. After saving and closing sshd_config, restart the ssh server to apply the new configuration:
 
@@ -73,7 +73,7 @@ Next, you'll create an RSA key pair on your Windows computer. Then you'll copy t
 1. From Windows, copy the public key to the Linux machine:
 
    ```cmd
-   scp -p %USERPROFILE%\.ssh\id_rsa.pub user@hostname
+   scp %USERPROFILE%\.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:
@@ -128,6 +128,10 @@ You've successfully set up ssh, created and deployed encryption keys, and tested
 
    For more information on troubleshooting your connection, see [Connect to your remote Linux computer](connect-to-your-remote-linux-computer.md).
 
+## Command-line utility for the Connection Manager  
+
+**Visual Studio 2019 version 16.5 or later**: ConnectionManager.exe is a command-line utility to manage remote development connections outside of Visual Studio. It's useful for tasks such as provisioning a new development machine. Or, you can use it to set up Visual Studio for continuous integration. For examples and a complete reference to the ConnectionManager command, see [ConnectionManager reference](connectionmanager-reference.md).  
+
 ## Optional: Enable or disable FIPS mode
 
 It's possible to enable FIPS mode globally in Windows.
@@ -141,7 +145,7 @@ It's possible to enable FIPS mode globally in Windows.
 1. In the **Local Security Setting** tab, select **Enabled** or **Disabled**, and then choose **OK** to save your changes.
 
 > [!WARNING]
-> The System cryptography security option may cause some applications to break or behave unexpectedly. For more information, see the blog post [Why We’re Not Recommending "FIPS mode" Anymore](https://techcommunity.microsoft.com/t5/microsoft-security-baselines/why-we-8217-re-not-recommending-8220-fips-mode-8221-anymore/ba-p/701037).
+> Enabling FIPS mode may cause some applications to break or behave unexpectedly. For more information, see the blog post [Why We’re Not Recommending "FIPS mode" Anymore](https://techcommunity.microsoft.com/t5/microsoft-security-baselines/why-we-8217-re-not-recommending-8220-fips-mode-8221-anymore/ba-p/701037).
 
 ## Additional resources
 
diff --git a/docs/linux/toc.yml b/docs/linux/toc.yml
@@ -9,6 +9,8 @@
       href: connect-to-your-remote-linux-computer.md
     - name: Set up FIPS-compliant secure remote Linux development
       href: set-up-fips-compliant-secure-remote-linux-development.md
+    - name: ConnectionManager reference
+      href: connectionmanager-reference.md
 - name: Create a new Linux project
   href: create-a-new-linux-project.md
 - name: Configure a Linux project
diff --git a/docs/toc.yml b/docs/toc.yml
@@ -1143,8 +1143,6 @@
           items: 
             - name: Additional MSVC build tools
               href: build/reference/c-cpp-build-tools.md
-            - name: ConnectionManager reference
-              href: build/reference/connectionmanager-reference.md
             - name: NMAKE reference
               expanded: false
               items: 
