get clearer about topic types (msbuild vs cmake)

Author: Tyler Whitney

docs/linux/cmake-linux-configure.md

@@ -12,17 +12,17 @@ Linux support is available in Visual Studio 2017 and later. To see the documenta
 ::: moniker range=">=vs-2017"
 This topic describes how to configure a C++ Linux project, continuing the series that began with [Create a Linux CMake project in Visual Studio](cmake-linux-project.md). If you are using MSBuild, instead, see [Configure a Linux Project in Visual Studio](configure-a-linux-project.md)
 
-## Configure a CMAKE build
+## Configure a CMake build for Linux
 
-To configure the build, open the CMake Settings Editor. This creates a **CMakeSettings.json** file at the root of your project. Configurations can be used to target different platforms (Windows, WSL, a remote system) with the same source code. They are also used to set your compilers, pass environment variables, and customize how CMake is invoked.
+To configure the build, open the CMake Settings Editor. This creates a *CMakeSettings.json* file at the root of your project. Configurations can be used to target different platforms (Windows, WSL, a remote system) with the same source code. They are also used to set your compilers, pass environment variables, and customize how CMake is invoked.
 
 The *CMakeSettings.json* file in a CMake Linux project specifies some or all of the properties listed in [Customize CMake settings](../build/customize-cmake-settings.md), plus additional properties that control the build settings on the remote Linux machine.
 ::: moniker-end
 
 ::: moniker range="vs-2017"
 To change the default CMake settings in Visual Studio 2017, choose **CMake** > **Change CMake Settings** > **CMakeLists.txt** from the main menu. Or, right-click *CMakeSettings.txt* in **Solution Explorer** and choose **Change CMake Settings**. Visual Studio then creates a new *CMakeSettings.json* file in your root project folder. You can open the file using the **CMake Settings** editor or modify the file directly. For more information, see [Customize CMake settings](../build/customize-cmake-settings.md).
 
-Given the following code and CMakeLists.txt file:
+Given the following code and *CMakeLists.txt* file:
 
 ```cpp
 // hello.cpp
@@ -125,7 +125,7 @@ You can use the following optional settings for more control:
 
 These options allow you to run commands on the Linux system before and after building, and before CMake generation. The values can be any command that is valid on the remote system. The output is piped back to Visual Studio.
 
-## Next step
+## Next steps
 
 [Debug a CMake Linux project](cmake-linux-debug.md)
 

docs/linux/cmake-linux-debug.md

@@ -24,7 +24,7 @@ When you open a CMake project folder, Visual Studio parses the *CMakeLists.txt*
 ::: moniker range="vs-2019"
 ### Windows Subsystem for Linux
 
-If you're targeting Windows Subsystem for Linux (WSL), select **Manage Configurations** in the configuration dropdown in the main toolbar. Then press the **Add Configuration** button and choose **WSL-Debug** or **WSL-Release** if using GCC. Use the Clang variants if using the Clang/LLVM toolset.
+To target Windows Subsystem for Linux (WSL), select **Manage Configurations** in the configuration dropdown in the main toolbar. Then press the **Add Configuration** button and choose **WSL-Debug** or **WSL-Release** if using GCC. Use the Clang variants if using the Clang/LLVM toolset.
 
 **Visual Studio 2019 version 16.1** When targeting WSL, no copying of sources or headers is necessary. That's because the compiler on Linux has direct access to your source files in the Windows file system. (In Windows 10 version 1903 and later, Windows applications likewise can access the Linux header files directly. Visual Studio doesn't take advantage of this capability yet.)
 ::: moniker-end
@@ -46,7 +46,7 @@ After you select a target, CMake runs automatically on the Linux system to gener
 
 ### Intellisense
 
-To provide IntelliSense support for headers on remote Linux systems, Visual Studio automatically copies them from the Linux machine to a directory on your local Windows machine. For more information, see [IntelliSense for remote headers](configure-a-linux-project.md#remote_intellisense).
+Accurate C++ IntelliSense requires access to the C++ headers that are referenced by C++ source files. Visual Studio automatically copies the headers referenced by a CMake project from Linux to Windows to provide a full-fidelity IntelliSense experience. For more information, see [IntelliSense for remote headers](configure-a-linux-project.md#remote_intellisense).
 
 ### Locale
 

docs/linux/cmake-linux-project.md

@@ -28,7 +28,7 @@ Also, make sure the following are installed on the remote machine:
 - gdb
 - rsync
 - zip
-- ninja-build if you're using Visual Studio 2019 or above
+- ninja-build (Visual Studio 2019 or above)
 ::: moniker-end
 
 ::: moniker range="vs-2017"
@@ -59,8 +59,6 @@ Alternatively, you can open your own CMake project in Visual Studio 2019. The fo
 ::: moniker range=">=vs-2017"
 ## Open a CMake project folder
 
-You can bring your own CMake project to Visual Studio by opening the folder that contains the `CMakeLists.txt` file.
-
 When you open a folder that contains an existing CMake project, Visual Studio uses variables in the CMake cache to automatically configure IntelliSense and builds. Local configuration and debugging settings get stored in JSON files. You can optionally share these files with others who are using Visual Studio.
 
 Visual Studio doesn't modify the *CMakeLists.txt* files. It's left alone so that others working on the same project can continue to use their existing tools. Visual Studio does regenerate the cache when you save edits to *CMakeLists.txt* or in some cases to *CMakeSettings.json*. But if you're using an **Existing Cache** configuration, then Visual Studio doesn't modify the cache.

docs/linux/configure-a-linux-project.md

@@ -1,17 +1,17 @@
 ---
-title: "Configure a C++ Linux project in Visual Studio"
-ms.date: "06/22/2020"
+title: "Configure a MSBuild-based C++ Linux project in Visual Studio"
+ms.date: "08/04/2020"
 ms.assetid: 4d7c6adf-54b9-4b23-bd23-5de0c825b768
 ---
-# Configure a Linux project
+# Configure a MSBuild-based C++ Linux project in Visual Studio
 
 ::: moniker range="vs-2015"
 
 Linux support is available in Visual Studio 2017 and later.
 
 ::: moniker-end
 
-This topic describes how to configure a C++ Linux project as described in [Create a new C++ Linux project in Visual Studio](create-a-new-linux-project.md). For CMake Linux projects, see [Configure a Linux CMake Project](cmake-linux-project.md).
+This topic describes how to configure a C++ Linux project as described in [Create a MSBuild-based C++ Linux project in Visual Studio](create-a-new-linux-project.md). For CMake Linux projects, see [Configure a Linux CMake Project](cmake-linux-project.md).
 
 You can configure a Linux project to target a physical Linux machine, a virtual machine, or the [Windows Subsystem for Linux](/windows/wsl/about) (WSL).
 

docs/linux/create-a-new-linux-project.md

@@ -1,10 +1,10 @@
 ---
-title: "Create a new C++ Linux project in Visual Studio"
-ms.date: "10/24/2019"
+title: "Create a MSBuild-based C++ Linux project in Visual Studio"
+ms.date: "08/04/2020"
 description: "Create a new MSBuild-based Linux project in Visual Studio."
 ms.assetid: 5d7c1d67-bc31-4f96-8622-2b4cf91372fd
 ---
-# Create a new Linux project
+# Create a MSBuild-based C++ Linux project in Visual Studio
 
 ::: moniker range="vs-2015"
 
@@ -36,7 +36,7 @@ To create a new Linux project in Visual Studio 2017, follow these steps:
 
 ## Next steps
 
-[Configure a Linux project](configure-a-linux-project.md)
+[Configure a MSBuild-based Linux project](configure-a-linux-project.md)
 
 ::: moniker-end
 
@@ -66,6 +66,6 @@ To create a new Linux project in Visual Studio 2019, follow these steps:
 
 ## Next steps
 
-[Configure a Linux project](configure-a-linux-project.md)
+[Configure a MSBuild-based Linux project](configure-a-linux-project.md)
 
 ::: moniker-end

docs/linux/deploy-run-and-debug-your-linux-project.md

@@ -1,18 +1,18 @@
 ---
-title: "Deploy, run, and debug your C++ Linux project in Visual Studio"
-description: "Describes how to compile, execute, and debug code on the remote target from inside a Linux C++ project in Visual Studio."
-ms.date: "06/07/2019"
+title: "Deploy, run, and debug your MSBuild-based C++ Linux project in Visual Studio"
+description: "Describes how to compile, execute, and debug code on the remote target from inside a MSBuild-based Linux C++ project in Visual Studio."
+ms.date: "08/04/2020"
 ms.assetid: f7084cdb-17b1-4960-b522-f84981bea879
 ---
-# Deploy, run, and debug your Linux project
+# Deploy, run, and debug your MSBuild-based Linux project
 
 ::: moniker range="vs-2015"
 
 Linux support is available in Visual Studio 2017 and later.
 
 ::: moniker-end
 
-Once you have created a Linux C++ project in Visual Studio and you have connected to the project using the [Linux Connection Manager](connect-to-your-remote-linux-computer.md), you can run and debug the project. You compile, execute, and debug the code on the remote target.
+Once you've created a MSBuild-based Linux C++ project in Visual Studio and you've connected to the project using the [Linux Connection Manager](connect-to-your-remote-linux-computer.md), you can run and debug the project. You compile, execute, and debug the code on the remote target.
 
 ::: moniker range="vs-2019"
 
@@ -46,20 +46,20 @@ There are several ways to interact with and debug your Linux project.
 
    ::: moniker-end
 
-   - In **gdbserver** mode, GDB is run locally, which connects to gdbserver on the remote system.  Note that this is the only mode that the Linux Console window supports.
+   - In **gdbserver** mode, GDB is run locally, which connects to gdbserver on the remote system. This is the only mode that the Linux Console window supports.
 
-   - In **gdb** mode, the Visual Studio debugger drives GDB on the remote system. This is a better option if the local version of GDB is not compatible with the version installed on the target computer. |
+   - In **gdb** mode, the Visual Studio debugger drives GDB on the remote system. This is a better option if the local version of GDB isn't compatible with the version installed on the target computer. |
 
    > [!NOTE]
    > If you are unable to hit breakpoints in gdbserver debugging mode, try gdb mode. gdb must first be [installed](download-install-and-setup-the-linux-development-workload.md) on the remote target.
 
 1. Select the remote target using the standard **Debug** toolbar in Visual Studio.
 
-   When the remote target is available, you will see it listed by either name or IP address.
+   When the remote target is available, you'll see it listed by either name or IP address.
 
    ![Remote target](media/remote_target.png)
 
-   If you have not yet connected to the remote target, you will see an instruction to use [Linux Connection Manager](connect-to-your-remote-linux-computer.md) to connect to the remote target.
+   If you haven't connected to the remote target yet, you'll see an instruction to use [Linux Connection Manager](connect-to-your-remote-linux-computer.md) to connect to the remote target.
 
    ![Remote Architecture](media/architecture.png)
 
@@ -81,7 +81,7 @@ There are several ways to interact with and debug your Linux project.
 
    ![Linux Console menu](media/consolemenu.png)
 
-   This console will display any console output from the target computer as well as take input and send it to the target computer.
+   This console will display any console output from the target computer and take input and send it to the target computer.
 
    ![Linux Console window](media/consolewindow.png)
 
@@ -118,13 +118,13 @@ ExePath="C:\temp\ConsoleApplication17\ConsoleApplication17\bin\x64\Debug\Console
 </SupplementalLaunchOptions>
 ```
 
-The **AttachOptionsForConnection** has most of the attributes you might need. The example above shows how to specify a location to search for additional .so libraries. The child element **ServerOptions** enables attaching to the remote process with gdbserver instead. To do that you need to specify a local gdb client (the one shipped in Visual Studio 2017 is shown above) and a local copy of the binary with symbols. The **SetupCommands** element enables you to pass commands directly to gdb. You can find all the options available in the [LaunchOptions.xsd schema](https://github.com/Microsoft/MIEngine/blob/master/src/MICore/LaunchOptions.xsd) on GitHub.
+The **AttachOptionsForConnection** has most of the attributes you might need. The example above shows how to specify a location to search for additional .so libraries. The child element **ServerOptions** enables attaching to the remote process with gdbserver instead. To do that, you need to specify a local gdb client (the one shipped in Visual Studio 2017 is shown above) and a local copy of the binary with symbols. The **SetupCommands** element enables you to pass commands directly to gdb. You can find all the options available in the [LaunchOptions.xsd schema](https://github.com/Microsoft/MIEngine/blob/master/src/MICore/LaunchOptions.xsd) on GitHub.
 
 ::: moniker range="vs-2019"
 
 ## <a name="separate_build_debug"></a> Specify different machines for building and debugging
 
-In Visual Studio 2019 version 16.1 You can separate your remote build machine from your remote debug machine for both MSBuild-based Linux projects and CMake projects that target a remote Linux machine. For example, you can now cross-compile on x64 and deploy to an ARM device when targeting IoT scenarios.
+In Visual Studio 2019 version 16.1, you can separate your remote build machine from your remote debug machine for both MSBuild-based Linux projects and CMake projects that target a remote Linux machine. For example, you can now cross-compile on x64 and deploy to an ARM device when targeting IoT scenarios.
 
 ### MSBuild-based projects
 
@@ -134,13 +134,13 @@ By default, the remote debug machine is the same as the remote build machine (**
 
 The drop-down menu for **Remote Debug Machine** is populated with all established remote connections. To add a new remote connection, navigate to **Tools** > **Options** > **Cross Platform** > **Connection Manager** or search for "Connection Manager" in **Quick Launch**. You can also specify a new remote deploy directory in the project's Property Pages (**Configuration Properties** > **General** > **Remote Deploy Directory**).
 
-By default, only the files necessary for the process to debug will be deployed to the remote debug machine. You can use **Solution Explorer** to configure which source files will be deployed to the remote debug machine. When you click on a source file, you will see a preview of its File Properties directly below the Solution Explorer.
+By default, only the files necessary for the process to debug will be deployed to the remote debug machine. You can use **Solution Explorer** to configure which source files will be deployed to the remote debug machine. When you click on a source file, you'll see a preview of its File Properties directly below the Solution Explorer.
 
 ![Linux deployable files](media/linux-deployable-content.png)
 
 The **Content** property specifies whether the file will be deployed to the remote debug machine. You can disable deployment entirely by navigating to **Property Pages** > **Configuration Manager** and unchecking **Deploy** for the desired configuration.
 
-In some cases, you may require more control over your project's deployment. For example, some files that you want to deploy might be outside of your solution or you want to customize your remote deploy directory per file ordirectory. In these cases, append the following code block(s) to your .vcxproj file and replace "example.cpp" with the actual file names:
+In some cases, you may require more control over your project's deployment. For example, some files that you want to deploy might be outside of your solution or you want to customize your remote deploy directory per file or directory. In these cases, append the following code block(s) to your .vcxproj file and replace "example.cpp" with the actual file names:
 
 ```xml
 

docs/linux/toc.yml

@@ -12,11 +12,11 @@
       href: ../linux/connectionmanager-reference.md
 - name: Build Linux projects with MSBuild in Visual Studio
   items:
-  - name: Create a new Linux project
+  - name: Create a MSBuild-based Linux project
     href: ../linux/create-a-new-linux-project.md
-  - name: Configure a Linux project
+  - name: Configure a MSBuild-based Linux project
     href: ../linux/configure-a-linux-project.md
-  - name: Deploy, run, and debug your Linux project
+  - name: Deploy, run, and debug your MSBuild-based Linux project
     href: ../linux/deploy-run-and-debug-your-linux-project.md
   - name: Linux Project Property Page reference
     items: