Merge pull request #4790 from MicrosoftDocs/main

2/07 AM Publish

Author: huypub

docs/atl/object-safety-classes.md

@@ -1,6 +1,6 @@
 ---
 description: "Learn more about: Object Safety Classes"
-title: "Object Safety Classes (ATL)| Microsoft Docs"
+title: Object Safety Classes (ATL)
 ms.date: "11/04/2016"
 ms.topic: "reference"
 helpviewer_keywords: ["safety classes", "object safety classes"]

docs/atl/reference/atl-classes.md

@@ -1,6 +1,6 @@
 ---
 description: "Learn more about: ATL classes and structs"
-title: "ATL classes and structs| Microsoft Docs"
+title: ATL classes and structs
 ms.date: "05/03/2018"
 helpviewer_keywords: ["classes [C++], ATL", "ATL, classes"]
 ---

docs/build/reference/nmake-property-page.md

@@ -1,20 +1,20 @@
 ---
 description: "Learn more about: NMake Property Page"
-title: "NMake Property Page (Windows C++)| Microsoft Docs"
+title: NMake Property Page (Windows C++)
 ms.date: "11/04/2016"
 f1_keywords: ["VC.Project.VCNMakeTool.ReBuildCommandLine", "VC.Project.VCNMakeTool.CleanCommandLine", "VC.Project.VCNMakeTool.Output", "VC.Project.VCNMakeTool.BuildCommandLine"]
 helpviewer_keywords: ["NMake property page"]
 ms.assetid: bd20cb52-9f1d-4240-b4fc-4f43205ac94b
 ---
 # NMake Property Page
 
-The **NMake** property page lets you specify build settings for NMake projects. (NMAKE is the Microsoft implementation of [Make](https://wikipedia.org/wiki/Make_(software)).)
+The **NMake** property page lets you specify build settings for *Makefile* projects. (NMAKE is the Microsoft implementation of [Make](https://wikipedia.org/wiki/Make_(software)).)
 
-For more information about NMake projects, see [Creating a Makefile Project](creating-a-makefile-project.md). For non-Windows MakeFile projects, see [MakeFile Project Properties (Linux C++)](../../linux/prop-pages/makefile-linux.md), [General Project Properties (Android C++ Makefile)](/visualstudio/cross-platform/general-makefile-android-prop-page) or [NMake Properties (Android C++)](/visualstudio/cross-platform/nmake-android-prop-page).
+For more information about Makefile projects, see [Creating a Makefile Project](creating-a-makefile-project.md). For non-Windows Makefile projects, see [Makefile Project Properties (Linux C++)](../../linux/prop-pages/makefile-linux.md), [General Project Properties (Android C++ Makefile)](/visualstudio/cross-platform/general-makefile-android-prop-page) or [NMake Properties (Android C++)](/visualstudio/cross-platform/nmake-android-prop-page).
 
-The **NMake** property page contains the following properties.
+The property page contains the following properties:
 
-## UIElement List
+## General
 
 - **Build Command Line**
 
@@ -32,6 +32,8 @@ The **NMake** property page contains the following properties.
 
    Specifies the name of the file that will contain the output for the command line. By default, this file name is based on the project name.
 
+## IntelliSense
+
 - **Preprocessor Definitions**
 
    Specifies any preprocessor definitions that the source files use. The default value is determined by the current platform and configuration.
@@ -42,21 +44,21 @@ The **NMake** property page contains the following properties.
 
 - **Forced Includes**
 
-   Specifies files that the preprocessor automatically processes even if they are not included in the project files.
+   Specifies files that the preprocessor automatically processes even if they aren't included in the project files.
 
 - **Assembly Search Path**
 
-   Specifies the directories where the .NET Framework searches when it trys to resolve .NET assemblies.
+   Specifies the directories where the .NET Framework searches when it resolves .NET assemblies.
 
 - **Forced Using Assemblies**
 
    Specifies assemblies that the .NET Framework automatically processes.
 
 - **Additional Options**
 
-   Specifies any additional compiler switches for IntelliSense to use when it parses C++ files.
+   Specifies any extra compiler switches for IntelliSense to use when it parses C++ files.
 
-For information about how to access the **NMake** property page, see [Set C++ compiler and build properties in Visual Studio](../working-with-project-properties.md).
+For information about how to access this property page, see [Set C++ compiler and build properties in Visual Studio](../working-with-project-properties.md).
 
 For information about how to programmatically access members of this object, see <xref:Microsoft.VisualStudio.VCProjectEngine.VCNMakeTool>.
 

docs/build/tips-for-improving-time-critical-code.md

@@ -8,7 +8,7 @@ ms.assetid: 8dbd24a5-0633-42d1-9771-776db338465f
 ---
 # Control flags
 
-The debug version of the Microsoft C run-time library uses the following flags to control the heap allocation and reporting process. For more information, see [CRT debugging techniques](/visualstudio/debugger/crt-debugging-techniques).
+The debug version of the Microsoft C run-time library uses the following flags to control the heap allocation and reporting process. For more information, see [CRT debugging techniques](./crt-debugging-techniques.md).
 
 | Flag | Description |
 |---|---|