Merge branch 'master' into cr-usingvside

Author: Colin Robertson

docs/error-messages/compiler-errors-1/c-cpp-build-errors.md

@@ -1,7 +1,7 @@
 ---
 title: "C/C++ Build Errors | Microsoft Docs"
 ms.custom: ""
-ms.date: "11/04/2016"
+ms.date: "11/17/2017"
 ms.reviewer: ""
 ms.suite: ""
 ms.technology: ["cpp-tools"]
@@ -17,17 +17,12 @@ ms.author: "corob"
 manager: "ghogen"
 ---
 # C/C++ Build Errors
-The articles in this section of the documentation explain error messages that are generated by the build tools. The [!INCLUDE[vcprvc](../../build/includes/vcprvc_md.md)] compiler and build tools can report many kinds of errors and warnings. The build tools may make assumptions about code intent and attempt to continue after an error or warning is found, so that more issues can be reported at the same time. If the tools make the wrong assumption, later errors or warnings may not apply to your project. When you correct issues in your project, always start with the first error or warning that's reported, and rebuild often.  
-  
- To get help on a particular error message in Visual Studio, select an error number in the **Output** window and press the F1 key to open the MSDN page for that error. In MSDN, you can also search for articles about errors or browse the list of errors by category in the navigation pane.  
-  
-> [!NOTE]
->  Not every [!INCLUDE[vcprvc](../../build/includes/vcprvc_md.md)] error or warning is documented in MSDN. In many cases, the diagnostic message provides all of the information that's available. If you think an error message needs additional explanation, you can let us know. You can use the feedback form on this page, or go to the menu bar in Visual Studio and choose **Help**, **Report a Bug**, or you can submit a suggestion or bug report on [Microsoft Connect](http://connect.microsoft.com/VisualStudio).  
-  
- You may find additional assistance for errors and warnings on the MSDN public forums. The [Visual C++ Language](http://go.microsoft.com/fwlink/?LinkId=158195) forum is for questions and discussions about the [!INCLUDE[vcprvc](../../build/includes/vcprvc_md.md)] language syntax and compiler. The [Visual C++ General](http://go.microsoft.com/fwlink/?LinkId=158194) forum is for questions about [!INCLUDE[vcprvc](../../build/includes/vcprvc_md.md)] that are not discussed in other forums. You may also find help about errors and warnings on [Stack Overflow](http://stackoverflow.com/).  
-  
- For links to additional resources about [!INCLUDE[vcprvc](../../build/includes/vcprvc_md.md)], see [Visual C++ Help and Community](../../visual-cpp-help-and-community.md).  
-  
-## See Also  
- [C/C++ Building Reference](../../build/reference/c-cpp-building-reference.md)   
- [Debugging in Visual Studio](/visualstudio/debugger/debugging-in-visual-studio)
+
+The articles in this section of the documentation explain diagnostic error and warning messages that are generated by the build tools.
+
+[!INCLUDE[error-boilerplate](../../error-messages/includes/error-boilerplate.md)]
+
+## See also
+
+[C/C++ Building Reference](../../build/reference/c-cpp-building-reference.md)   
+[Debugging in Visual Studio](/visualstudio/debugger/debugging-in-visual-studio)

docs/error-messages/compiler-errors-1/compiler-errors-c2001-through-c2099.md

@@ -1,6 +1,6 @@
 ---
 title: "Compiler Errors C2600 Through C2699 | Microsoft Docs"
-ms.date: "10/25/2017"
+ms.date: "11/17/2017"
 ms.technology: ["cpp-tools"]
 ms.topic: "error-reference"
 f1_keywords: ["C2604", "C2606", "C2607", "C2608", "C2609", "C2610", "C2615", "C2618", "C2620", "C2621", "C2622", "C2623", "C2625", "C2629", "C2631", "C2639", "C2641", "C2642", "C2643", "C2644", "C2684", "C2685", "C2686", "C2697"]
@@ -13,12 +13,11 @@ manager: "ghogen"
 ---
 # Compiler Errors C2600 Through C2699
 
-The articles in this part of the documentation contain information about a subsection of the Visual C++ compiler errors. You can access the information here or, in the **Output** window in Visual Studio, you can select an error number and then choose the F1 key.
+The articles in this section of the documentation explain a subset of the error messages that are generated by the compiler.
 
-> [!NOTE]
-> Not every [!INCLUDE[vcprvc](../../build/includes/vcprvc_md.md)] error is documented in MSDN. In many cases, the diagnostic message provides all of the information that's available. If you think an error message needs additional explanation, you can let us know. You can use the feedback form on this page, or go to the menu bar in Visual Studio and choose **Help**, **Report a Bug**, or you can submit a suggestion or bug report on [Microsoft Connect](http://connect.microsoft.com/VisualStudio).
+[!INCLUDE[error-boilerplate](../../error-messages/includes/error-boilerplate.md)]
 
-You may find additional assistance for errors and warnings on the MSDN public forums. The [Visual C++ Language](http://go.microsoft.com/fwlink/?LinkId=158195) forum is for questions and discussions about the [!INCLUDE[vcprvc](../../build/includes/vcprvc_md.md)] language syntax and compiler. The [Visual C++ General](http://go.microsoft.com/fwlink/?LinkId=158194) forum is for questions about [!INCLUDE[vcprvc](../../build/includes/vcprvc_md.md)] that are not discussed in other forums. You may also find help about errors and warnings on [Stack Overflow](http://stackoverflow.com/).
+## Error messages
 
 |Error|Message|
 |-----------|-------------|