fixed merge conflict

mikeblome · mikeblome · commit 236a0cc393d1 · 2018-12-13T16:22:02.000-08:00
diff --git a/docs/_breadcrumb/toc.yml b/docs/_breadcrumb/toc.yml
@@ -100,49 +100,9 @@
         tocHref: /cpp/build/
         tocHref: /cpp/build/building-c-cpp-programs
         items:
-        - name: Visual Studio projects
-          tocHref: /cpp/build/
-          topicHref: /cpp/build/creating-and-managing-visual-cpp-projects
-          items:
-          - name: Set compiler and build properties
-            tocHref: /cpp/build/
-            topicHref: /cpp/build/working-with-project-properties
-          - name: Custom Build Steps and Build Events
-            tocHref: /cpp/build/
-            topicHref: /cpp/build/understanding-custom-build-steps-and-build-events
-          - name: Create a C++ Project from Existing Code
-            tocHref: /cpp/build/
-            topicHref: /cpp/build/how-to-create-a-cpp-project-from-existing-code
-        - name: CMake projects
-          tocHref: /cpp/build/
-          topicHref: /cpp/build/cmake-tools-for-visual-cpp
-        - name: Open Folder projects
-          tocHref: /cpp/build/
-          topicHref: /cpp/build/non-msbuild-projects
-        - name: Release Builds
-          tocHref: /cpp/build/
-          topicHref: /cpp/build/release-builds
-        - name: Use the MSVC toolset from the command line
-          tocHref: /cpp/build/
-          topicHref: /cpp/build/building-on-the-command-line
-        - name: Use MSBuild from the command line
-          tocHref: /cpp/build/
-          topicHref: /cpp/build/msbuild-visual-cpp
-        - name: Building C/C++ Isolated Applications and Side-by-side Assemblies
-          tocHref: /cpp/build/
-          topicHref: /cpp/build/building-c-cpp-isolated-applications-and-side-by-side-assemblies
-        - name: Configure Visual C++ for 64-bit, x64 targets
-          tocHref: /cpp/build/
-          topicHref: /cpp/build/configuring-programs-for-64-bit-visual-cpp
-        - name: Configure Visual C++ for ARM processors
-          tocHref: /cpp/build/
-          topicHref: /cpp/build/msbuild-visual-cpp
-        - name: Configuring Programs for Windows XP
-          tocHref: /cpp/build/
-          topicHref: /cpp/build/configuring-programs-for-windows-xp
         - name: Build Reference
           tocHref: /cpp/build/reference/
-          topicHref: /cpp/build/reference/configuring-programs-for-arm-processors-visual-cpp
+          topicHref: /cpp/build/reference/c-cpp-building-reference
           items:
             - name: Compiler Errors
               tocHref: /cpp/error-messages/compiler-errors-1/
diff --git a/docs/build/building-on-the-command-line.md b/docs/build/building-on-the-command-line.md
@@ -142,6 +142,8 @@ When you build on the command line, the F1 command is not available for instant
 
 ## In This Section
 
+The articles in this section of the documentation show how to build apps on the command line, describe how to customize the command-line build environment to use 64-bit toolsets and target x86, x64, and ARM platforms, and demonstrate how to use the command-line build tools MSBuild and NMAKE.
+
 [Walkthrough: Compiling a Native C++ Program on the Command Line](walkthrough-compiling-a-native-cpp-program-on-the-command-line.md)<br/>
 Gives an example that shows how to create and compile a simple C++ program on the command line.
 
@@ -157,21 +159,11 @@ Describes how to create and compile a C++/CX program that uses the Windows Runti
 [Set the Path and Environment Variables for Command-Line Builds](setting-the-path-and-environment-variables-for-command-line-builds.md)<br/>
 Describes how to start a command prompt window that has the required environment variables set for command-line builds that target x86, x64, and ARM platforms by using a 32-bit or 64-bit toolset.
 
-[Compiler Command-Line Syntax](compiler-command-line-syntax.md)<br/>
-
-[CL Filename Syntax](reference/cl-filename-syntax.md)<br/>
-
-[Order of CL Options](reference/order-of-cl-options.md)<br/>
-
-[Return Value of cl.exe](reference/return-value-of-cl-exe.md)<br/>
-
-[CL Environment Variables](reference/cl-environment-variables.md)<br/>
-
-[CL Command Files](reference/cl-command-files.md)<br/>
-
-[Fast Compilation](reference/fast-compilation.md)<br/>
+[NMAKE Reference](reference/nmake-reference.md)<br/>
+Provides links to articles that describe the Microsoft Program Maintenance Utility (NMAKE.EXE).
 
-[CL Invokes the Linker](reference/cl-invokes-the-linker.md)<br/>
+[MSBuild (Visual C++)](msbuild-visual-cpp.md)<br/>
+Provides links to articles that discuss how to use msbuild.exe from the command line.
 
 ## Related Sections
 
diff --git a/docs/build/setting-the-path-and-environment-variables-for-command-line-builds.md b/docs/build/setting-the-path-and-environment-variables-for-command-line-builds.md
@@ -1,5 +1,5 @@
 ---
-title: "Path and Environment Variables for C++ Command-Line Builds - Visual Studio"
+title: "Set the Path and Environment Variables for Command-Line Builds"
 ms.custom: "conceptual"
 ms.date: "12/14/2018"
 f1_keywords: ["include", "Lib", "Path"]
