Update Linux CMake instructions for issue 312

Colin Robertson · Colin Robertson · commit 6e5d5faf1bcd · 2018-07-03T13:59:44.000-07:00
diff --git a/docs/linux/cmake-linux-project.md b/docs/linux/cmake-linux-project.md
@@ -14,26 +14,25 @@ ms.workload: ["cplusplus", "linux"]
 ---
 
 # Configure a Linux CMake project
-  
-**Visual Studio 2017 version 15.4**
-When you install the Linux C++ workload, CMake support for Linux is selected by default. You can now work on your existing code base that uses CMake without having to convert it to a Visual Studio project. If your code base is cross-platform, you can target both Windows and Linux from within Visual Studio. 
 
-This topic assumes you have basic familiarity with CMake support in Visual Studio. For more information, see [CMake Tools for Visual C++](../ide/cmake-tools-for-visual-cpp.md). For more information about CMake itself, see [Build, Test and Package Your Software With CMake](https://cmake.org/).
-
-> [!NOTE] 
-> The CMake support in Visual Studio requires the server mode support that was introduced in CMake 3.8. If your package manager provides an older version of CMake, you can work around it by building CMake 3.8 from source.
+**Visual Studio 2017 version 15.4 and later**  
+When you install the Linux C++ workload, CMake support for Linux is selected by default. You can now work on your existing code base that uses CMake without having to convert it to a Visual Studio project. If your code base is cross-platform, you can target both Windows and Linux from within Visual Studio.
 
+This topic assumes you have basic familiarity with CMake support in Visual Studio. For more information, see [CMake Tools for Visual C++](../ide/cmake-tools-for-visual-cpp.md). For more information about CMake itself, see [Build, Test and Package Your Software With CMake](https://cmake.org/).
 
+> [!NOTE]  
+> The CMake support in Visual Studio requires the server mode support that was introduced in CMake 3.8. If your package manager provides an older version of CMake, you can work around it by [building CMake from source](#build-a-supported-cmake release-from-source) or downloading it from the official [CMake download page](https://cmake.org/download/).
 
 ## Open a folder
-To get started, choose **File | Open | Folder** from the main menu or else type `devenv.exe <foldername>` on the command line. The folder you open should have a CMakeLists.txt file in it, along with your source code.
+
+To get started, choose **File** > **Open** > **Folder** from the main menu or else type `devenv.exe <foldername>` on the command line. The folder you open should have a CMakeLists.txt file in it, along with your source code.
 The following example shows a simple CMakeLists.txt file and .cpp file:
 
 ```cpp
 // Hello.cpp
 
 #include <iostream>;
- 
+
 int main(int argc, char* argv[])
 {
     std::cout << "Hello" << std::endl;
@@ -48,21 +47,26 @@ add_executable(hello-cmake hello.cpp)
 ```
 
 ## Choose a Linux target
-As soon as you open the folder, Visual Studio parses the CMakeLists.txt file and specifies a Windows target of x86-Debug. To target Linux, change the project settings to Linux-Debug or Linux-Release.
 
-By default, Visual Studio chooses the first remote system in the list (under **Tools | Options | Cross Platform | Connection Manager**). If no remote connections are found, you are prompted to create one.
+As soon as you open the folder, Visual Studio parses the CMakeLists.txt file and specifies a Windows target of **x86-Debug**. To target Linux, change the project settings to **Linux-Debug** or **Linux-Release**.
+
+By default, Visual Studio chooses the first remote system in the list under **Tools** > **Options** > **Cross Platform** > **Connection Manager**. If no remote connections are found, you are prompted to create one.
 
-After you specify a Linux target, your source is copied to your Linux machine. Then, CMake is run on the Linux machine to generate the CMake cache for your project.  
+After you specify a Linux target, your source is copied to your Linux machine. Then, CMake is run on the Linux machine to generate the CMake cache for your project.
 
-![Generate CMake cache on Linux](media/cmake-linux-1.png "Generate the CMake cache on Linux")  
+![Generate CMake cache on Linux](media/cmake-linux-1.png "Generate the CMake cache on Linux")
 
-**Visual Studio 2017 version 15.7 and later:**
+**Visual Studio 2017 version 15.7 and later:**  
 To provide IntelliSense support for remote headers, Visual Studio automatically copies them to a directory on your local Windows machine. For more information, see [IntelliSense for remote headers](configure-a-linux-project.md#remote_intellisense).
 
-## Debug the project  
-To debug your code on the remote system, set a breakpoint, select the CMake target as the startup item in the toolbar menu next to the project setting, and click run (or press F5).
+## Debug the project
+
+To debug your code on the remote system, set a breakpoint, select the CMake target as the startup item in the toolbar menu next to the project setting, and choose **&#x23f5; Start** on the toolbar, or press F5.
+
+To customize your program’s command line arguments, right-click on the executable in **Solution Explorer** and select **Debug and Launch Settings**. This opens or creates a launch.vs.json configuration file that contains information about your program. To specify additional arguments, add them in the `args` JSON array. For more information, see [Open Folder projects in Visual C++](https://docs.microsoft.com/en-us/cpp/ide/non-msbuild-projects).
+
+## Configure CMake settings for Linux
 
-## Configure CMake Settings for Linux
 To change the default CMake settings, 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 file in your folder called `CMakeSettings.json` that is populated with the default configurations that are listed in the project settings menu item. The following example shows the default configuration for Linux-Debug based on the previous code example:
 
 ```json
@@ -87,7 +91,8 @@ To change the default CMake settings, choose **CMake | Change CMake Settings | C
 
 The `name` value can be whatever you like. The `remoteMachineName` value specifies which remote system to target, in case you have more than one. IntelliSense is enabled for this field to help you select the right system. The field `remoteCMakeListsRoot` specifies where your project sources will be copied to on the remote system. The field `remoteBuildRoot` is where the build output will be generated on your remote system. That output is also copied locally to the location specified by `buildRoot`.
 
-## Building a supported CMake release from source
+## Build a supported CMake release from source
+
 The minimum version of CMake required on your Linux machine is 3.8, and it must also support server mode. To verify this run this command:
 
 ```cmd
@@ -100,9 +105,11 @@ To verify that server mode is enabled, run:
 cmake -E capabilities
 ```
 
-In the output, look for “serverMode”:true. Note that even when you compile CMake from source as described below you should check the capabilities when done. Your Linux system may have limitations that prevent server mode from being enabled.
+In the output, look for **"serverMode":true**. Note that even when you compile CMake from source as described below you should check the capabilities when done. Your Linux system may have limitations that prevent server mode from being enabled.
+
+To get started building CMake from source in the shell for your Linux system, make sure your package manager is up to date, and that you have git and cmake available.
 
-To get started building from source in the shell for your Linux system make sure your package manager is up to date, and that you have git and cmake available. First, clone the CMake sources from our repo where we use for Visual Studio's CMake support:
+First, clone the CMake sources from the [Microsoft CMake repo](https://github.com/Microsoft/CMake) where we maintain a fork for Visual Studio's CMake support:
 
 ```cmd
 sudo apt-get update
@@ -111,7 +118,7 @@ git clone https://github.com/Microsoft/CMake.git
 cd CMake
 ```
 
-Next, run the following commands:
+Next, to build and install the current release of CMake to /usr/local/bin, run these commands:
 
 ```cmd
 mkdir out
@@ -121,13 +128,14 @@ make
 sudo make install
 ```
 
-The above commands build and install the current release of CMake to /usr/local/bin. Run this command to verify the version is >= 3.8 and that server mode is enabled:
+Next, run this command to verify the version is >= 3.8 and that server mode is enabled:
 
 ```cmd
 /usr/local/bin/cmake –version
 cmake -E capabilities
 ```
 
-## See Also
+## See also
+
 [Working with Project Properties](../ide/working-with-project-properties.md)  
-[CMake Tools for Visual C++](../ide/cmake-tools-for-visual-cpp.md)
+[CMake Tools for Visual C++](../ide/cmake-tools-for-visual-cpp.md)  
