fixed merge conflicts

Author: mikeblome

.openpublishing.redirection.json

@@ -31,8 +31,13 @@
             "redirect_document_id": false
         },
         {
-            "source_path": "docs/atl/reference/patlmodule.md",
-            "redirect_url": "/cpp/atl/reference/atl-global-variables",
+            "source_path": "docs/atl/reference/atl-archetypes.md",
+            "redirect_url": "/cpp/atl/reference/worker-archetype",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/atl/reference/atl-structures.md",
+            "redirect_url": "/cpp/atl/reference/atl-classes",
             "redirect_document_id": false
         },
         {
@@ -202,7 +207,17 @@
         },
         {
             "source_path": "docs/cppcx/index.md",
-            "redirect_url": "/cppcx/visual-c-language-reference-c-cx",
+            "redirect_url": "/cpp/cppcx/visual-c-language-reference-c-cx",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/cppcx/operator-subtracttype-hat.md",
+            "redirect_url": "/cpp/cppcx/operator-type-hat",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/cppcx/operator-subtractwindows-ui-xaml-interop-typename.md",
+            "redirect_url": "/cpp/cppcx/operator-windows-ui-xaml-interop-typename",
             "redirect_document_id": false
         },
         {
@@ -370,6 +385,11 @@
             "redirect_url": "/cpp/mfc/mfc-library-versions#mfc-static-library-naming-conventions",
             "redirect_document_id": false
         },
+        {
+            "source_path": "docs/mfc/reference/button-styles.md",
+            "redirect_url": "/cpp/mfc/reference/styles-used-by-mfc#button-styles",
+            "redirect_document_id": false
+        },
         {
             "source_path": "docs/mfc/reference/callback-function-for-cdc-enumobjects.md",
             "redirect_url": "/cpp/mfc/reference/callback-functions-used-by-mfc#enum_objects",
@@ -380,6 +400,11 @@
             "redirect_url": "/cpp/mfc/reference/callback-functions-used-by-mfc#graystring",
             "redirect_document_id": false
         },
+        {
+            "source_path": "docs/mfc/reference/combo-box-styles.md",
+            "redirect_url": "/cpp/mfc/reference/styles-used-by-mfc#combo-box-styles",
+            "redirect_document_id": false
+        },
         {
             "source_path": "docs/mfc/reference/callback-function-for-cdc-setabortproc.md",
             "redirect_url": "/cpp/mfc/reference/callback-functions-used-by-mfc#setabortproc",
@@ -405,6 +430,11 @@
             "redirect_url": "/cpp/mfc/reference/mfc-classes",
             "redirect_document_id": false
         },
+        {
+            "source_path": "docs/mfc/reference/list-box-styles.md",
+            "redirect_url": "/cpp/mfc/reference/styles-used-by-mfc#list-box-styles",
+            "redirect_document_id": false
+        },
         {
             "source_path": "docs/mfc/reference/message-box-styles.md",
             "redirect_url": "/cpp/mfc/reference/styles-used-by-mfc#message-box-styles",
@@ -576,4 +606,4 @@
             "redirect_document_id": false
         }
     ]
-}
+}

CONTRIBUTING.md

@@ -15,7 +15,7 @@ In this topic, we'll cover:
 ## Process for contributing
 
 **Step 1:** Open an issue describing the article you wish to write and how it relates to existing content.
-The content inside the **docs** folder is organized into sections that are organized by content area (e.g., debugger). Try to determine the correct folder for your new content. Get feedback on your proposal. 
+The content inside the **docs** folder is organized into sections that are organized by content area (e.g., debugger). Try to determine the correct folder for your new content. Get feedback on your proposal.
 
 You can skip this first step for small changes.
 
@@ -52,7 +52,7 @@ The Visual Studio team will review your PR and let you know if the change looks
 
 The maintainers will merge your PR into the master branch once feedback has been applied and your change looks good.
 
-On a certain cadence, we push all commits from master branch into the live branch and then you'll be able to see your contribution live at https://docs.microsoft.com/en-us/cpp/.
+On a certain cadence, we push all commits from master branch into the live branch and then you'll be able to see your contribution live on [docs.microsoft.com](https://docs.microsoft.com/en-us/cpp/).
 
 ## DOs and DON'Ts
 
@@ -66,7 +66,7 @@ Below is a short list of guiding rules that you should keep in mind when you are
 - **DO** blog and tweet (or whatever) about your contributions, frequently!
 
 > [!NOTE]
-> You might notice that some of the topics are not currently following all the guidelines specified here and on the [style guide](./styleguide/template.md) as well. We're working towards achieving consistency throughout the site. Check the list of [open issues](https://github.com/dotnet/docs/issues?q=is%3Aissue+is%3Aopen+label%3Aguidelines-adherence) we're currently tracking for that specific goal.
+> You might notice that some of the topics are not currently following all the guidelines specified here and on the [style guide](./styleguide/template.md) as well. We're working towards achieving consistency throughout the site. Check the list of [open issues](https://github.com/MicrosoftDocs/cpp-docs/issues?q=is%3Aissue+is%3Aopen+label%3Aguidelines-adherence) we're currently tracking for that specific goal.
 
 ## Building the docs
 
@@ -82,14 +82,18 @@ If you are comfortable with other ways listed on the link above, feel free to us
 
 You can build and preview the resulting site locally using a built-in web server. Navigate to the `cpp-docs\docs` folder on your machine and type the following command:
 
-```
-docfx -t default --serve
-```
+`docfx -t default --serve`
 
-This starts the local preview on [localhost:8080](http://localhost:8080). You can then view the changes by going to `http://localhost:8080/[path]`, such as http://localhost:8080/cpp/visual-cpp-in-visual-studio.html.
+This starts the local preview on [localhost:8080](http://localhost:8080). You can then view the changes by going to `http://localhost:8080/[path]`, such as `http://localhost:8080/cpp/visual-cpp-in-visual-studio.html`.
 
-**Note:** the local preview currently doesn't contain any themes at the moment so the look and feel won't be the same as in the documentation site. We're working towards fixing that experience.
+**Note:** the local preview currently doesn't contain any themes at the moment so the look and feel won't be the same as in the documentation site. We're working towards fixing that experience. We also use some custom extensions for embedded video, notes, and included documents, that won't be visible in the preview.
 
-# Contributing to samples
+## Contributing to samples
 
 For now, include required sample code as inline code blocks in your article. The repo has a codesnippets folder, but this is not ready for public contributions.
+
+## Contributor license agreement
+
+You must sign the [Contribution License Agreement (CLA)](LICENSE) before your PR is merged. This is a one-time requirement for projects in docs.microsoft.com. You can read more about [Contribution License Agreements (CLA)](http://en.wikipedia.org/wiki/Contributor_License_Agreement) on Uncyclopedia.
+
+You don't have to sign the agreement up-front. You can clone, fork, and submit your PR as usual. When your PR is created, it is classified by a CLA bot. If the change is trivial (for example, you fixed a typo), then the PR is labeled with cla-not-required. Otherwise, it's classified as cla-required. Once you signed the CLA, the current and all future pull requests are labeled as cla-signed.

docs/TOC.md

@@ -26,6 +26,7 @@
 # [Security Best Practices for C++](security/security-best-practices-for-cpp.md)
 ## [Running as a Member of the Users Group](security/running-as-a-member-of-the-users-group.md)
 ## [How User Account Control (UAC) Affects Your Application](security/how-user-account-control-uac-affects-your-application.md)
+## [C++ Developer Guidance for Speculative Execution Side Channels](security/developer-guidance-speculative-execution.md)
 # [Visual C++ Samples](visual-cpp-samples.md)
 # [Visual C++ Help and Community](visual-cpp-help-and-community.md)
 # [How to Report a Problem with the Visual C++ Toolset](how-to-report-a-problem-with-the-visual-cpp-toolset.md)

docs/assembler/arm/arm-assembler-command-line-reference.md

@@ -2,17 +2,12 @@
 title: "ARM Assembler Command-Line Reference | Microsoft Docs"
 ms.custom: ""
 ms.date: "11/04/2016"
-ms.reviewer: ""
-ms.suite: ""
-ms.technology: ["cpp-tools"]
-ms.tgt_pltfrm: ""
+ms.technology: ["cpp-masm"]
 ms.topic: "reference"
 dev_langs: ["C++"]
 ms.assetid: f7b89478-1ab5-4995-8cde-a805f0462c45
-caps.latest.revision: 12
 author: "corob-msft"
 ms.author: "corob"
-manager: "ghogen"
 ms.workload: ["cplusplus"]
 ---
 # ARM Assembler Command-Line Reference

docs/assembler/arm/arm-assembler-diagnostic-messages.md

@@ -2,17 +2,12 @@
 title: "ARM Assembler Diagnostic Messages | Microsoft Docs"
 ms.custom: ""
 ms.date: "11/04/2016"
-ms.reviewer: ""
-ms.suite: ""
-ms.technology: ["cpp-tools"]
-ms.tgt_pltfrm: ""
+ms.technology: ["cpp-masm"]
 ms.topic: "reference"
 dev_langs: ["C++"]
 ms.assetid: 52b38267-6023-4bdc-a0ef-863362f48eec
-caps.latest.revision: 6
 author: "corob-msft"
 ms.author: "corob"
-manager: "ghogen"
 ms.workload: ["cplusplus"]
 ---
 # ARM Assembler Diagnostic Messages

docs/assembler/arm/arm-assembler-directives.md

@@ -2,17 +2,12 @@
 title: "ARM Assembler Directives | Microsoft Docs"
 ms.custom: ""
 ms.date: "11/04/2016"
-ms.reviewer: ""
-ms.suite: ""
-ms.technology: ["cpp-tools"]
-ms.tgt_pltfrm: ""
+ms.technology: ["cpp-masm"]
 ms.topic: "reference"
 dev_langs: ["C++"]
 ms.assetid: 9cfa8896-ec10-4e77-855a-3135c40d7d2a
-caps.latest.revision: 5
 author: "corob-msft"
 ms.author: "corob"
-manager: "ghogen"
 ms.workload: ["cplusplus"]
 ---
 # ARM Assembler Directives

docs/assembler/arm/arm-assembler-reference.md

@@ -2,17 +2,12 @@
 title: "ARM Assembler Reference | Microsoft Docs"
 ms.custom: ""
 ms.date: "08/28/2017"
-ms.reviewer: ""
-ms.suite: ""
-ms.technology: ["cpp-tools"]
-ms.tgt_pltfrm: ""
+ms.technology: ["cpp-masm"]
 ms.topic: "reference"
 dev_langs: ["C++"]
 ms.assetid: f8a076cc-9627-4328-a34a-9c44f7a3aab1
-caps.latest.revision: 13
 author: "corob-msft"
 ms.author: "corob"
-manager: "ghogen"
 ms.workload: ["cplusplus"]
 ---
 # ARM Assembler Reference

docs/assembler/inline/accessing-c-or-cpp-data-in-asm-blocks.md

@@ -2,18 +2,13 @@
 title: "Accessing C or C++ Data in __asm Blocks | Microsoft Docs"
 ms.custom: ""
 ms.date: "11/04/2016"
-ms.reviewer: ""
-ms.suite: ""
-ms.technology: ["cpp-tools"]
-ms.tgt_pltfrm: ""
-ms.topic: "article"
+ms.technology: ["cpp-masm"]
+ms.topic: "conceptual"
 dev_langs: ["C++"]
 helpviewer_keywords: ["data members [C++], in __asm blocks", "data access [C++], in __asm blocks", "__asm keyword [C++], data members", "structure types in __asm blocks"]
 ms.assetid: e99f5a28-0381-4090-8ece-6af8f2436a49
-caps.latest.revision: 7
 author: "corob-msft"
 ms.author: "corob"
-manager: "ghogen"
 ms.workload: ["cplusplus"]
 ---
 # Accessing C or C++ Data in __asm Blocks

docs/assembler/inline/advantages-of-inline-assembly.md

@@ -2,18 +2,13 @@
 title: "Advantages of Inline Assembly | Microsoft Docs"
 ms.custom: ""
 ms.date: "11/04/2016"
-ms.reviewer: ""
-ms.suite: ""
-ms.technology: ["cpp-tools"]
-ms.tgt_pltfrm: ""
-ms.topic: "article"
+ms.technology: ["cpp-masm"]
+ms.topic: "conceptual"
 dev_langs: ["C++"]
 helpviewer_keywords: ["assembler [C++], advantages", "inline assembly [C++], about inline assembly", "inline assembly [C++], using"]
 ms.assetid: 94364d97-faa7-4bdf-8473-570956986c51
-caps.latest.revision: 7
 author: "corob-msft"
 ms.author: "corob"
-manager: "ghogen"
 ms.workload: ["cplusplus"]
 ---
 # Advantages of Inline Assembly

docs/assembler/inline/asm.md

@@ -2,19 +2,14 @@
 title: "__asm | Microsoft Docs"
 ms.custom: ""
 ms.date: "11/04/2016"
-ms.reviewer: ""
-ms.suite: ""
-ms.technology: ["cpp-tools"]
-ms.tgt_pltfrm: ""
-ms.topic: "article"
+ms.technology: ["cpp-masm"]
+ms.topic: "conceptual"
 f1_keywords: ["__asm", "__asm_cpp"]
 dev_langs: ["C++"]
 helpviewer_keywords: ["__asm keyword [C++], vs. asm blocks", "__asm keyword [C++]"]
 ms.assetid: 77ff3bc9-a492-4b5e-85e1-fa4e414e79cd
-caps.latest.revision: 14
 author: "corob-msft"
 ms.author: "corob"
-manager: "ghogen"
 ms.workload: ["cplusplus"]
 ---
 # __asm

docs/assembler/inline/assembly-language-comments.md

@@ -2,18 +2,13 @@
 title: "Assembly-Language Comments | Microsoft Docs"
 ms.custom: ""
 ms.date: "11/04/2016"
-ms.reviewer: ""
-ms.suite: ""
-ms.technology: ["cpp-tools"]
-ms.tgt_pltfrm: ""
-ms.topic: "article"
+ms.technology: ["cpp-masm"]
+ms.topic: "conceptual"
 dev_langs: ["C++"]
 helpviewer_keywords: ["assembly language [C++], comments", "comments [C++], assembly language", "macros [C++], assembly language", "__asm keyword [C++], instructions"]
 ms.assetid: 0dc10850-77f5-426e-9dab-185ea28e06e4
-caps.latest.revision: 7
 author: "corob-msft"
 ms.author: "corob"
-manager: "ghogen"
 ms.workload: ["cplusplus"]
 ---
 # Assembly-Language Comments

docs/assembler/inline/calling-c-functions-in-inline-assembly.md

@@ -2,18 +2,13 @@
 title: "Calling C Functions in Inline Assembly | Microsoft Docs"
 ms.custom: ""
 ms.date: "11/04/2016"
-ms.reviewer: ""
-ms.suite: ""
-ms.technology: ["cpp-tools"]
-ms.tgt_pltfrm: ""
-ms.topic: "article"
+ms.technology: ["cpp-masm"]
+ms.topic: "conceptual"
 dev_langs: ["C++"]
 helpviewer_keywords: ["function calls, C functions", "function calls, in inline assembly", "functions [C], calling in inline assembly", "Visual C, functions", "inline assembly, calling functions", "__asm keyword [C++], calling functions"]
 ms.assetid: f8a8d568-d175-4e23-9b24-36ef60a4cab3
-caps.latest.revision: 7
 author: "corob-msft"
 ms.author: "corob"
-manager: "ghogen"
 ms.workload: ["cplusplus"]
 ---
 # Calling C Functions in Inline Assembly

docs/assembler/inline/calling-cpp-functions-in-inline-assembly.md

@@ -2,18 +2,13 @@
 title: "Calling C++ Functions in Inline Assembly | Microsoft Docs"
 ms.custom: ""
 ms.date: "11/04/2016"
-ms.reviewer: ""
-ms.suite: ""
-ms.technology: ["cpp-tools"]
-ms.tgt_pltfrm: ""
-ms.topic: "article"
+ms.technology: ["cpp-masm"]
+ms.topic: "conceptual"
 dev_langs: ["C++"]
 helpviewer_keywords: ["functions [C++], calling in inline assembly", "function calls, C++ functions", "function calls, in inline assembly", "Visual C++, functions", "inline assembly, calling functions", "__asm keyword [C++], calling functions"]
 ms.assetid: 1f0d1eb3-54cf-45d5-838d-958188616b38
-caps.latest.revision: 7
 author: "corob-msft"
 ms.author: "corob"
-manager: "ghogen"
 ms.workload: ["cplusplus"]
 ---
 # Calling C++ Functions in Inline Assembly

docs/assembler/inline/data-directives-and-operators-in-inline-assembly.md

@@ -2,18 +2,13 @@
 title: "Data Directives and Operators in Inline Assembly | Microsoft Docs"
 ms.custom: ""
 ms.date: "11/04/2016"
-ms.reviewer: ""
-ms.suite: ""
-ms.technology: ["cpp-tools"]
-ms.tgt_pltfrm: ""
-ms.topic: "article"
+ms.technology: ["cpp-masm"]
+ms.topic: "conceptual"
 dev_langs: ["C++"]
 helpviewer_keywords: ["data directives [C++]", "__asm keyword [C++], referencing limitations", "MASM (Microsoft Macro Assembler), directives", "directives [C++], MASM", "MASM (Microsoft Macro Assembler), structures", "operators [MASM]", "inline assembly, operators", "inline assembly, data directives", "MASM (Microsoft Macro Assembler), operators", "structures [C++], MASM"]
 ms.assetid: fb7410c7-156a-4131-bcfc-211aa70533e3
-caps.latest.revision: 7
 author: "corob-msft"
 ms.author: "corob"
-manager: "ghogen"
 ms.workload: ["cplusplus"]
 ---
 # Data Directives and Operators in Inline Assembly

docs/assembler/inline/debugging-and-listings-for-inline-assembly.md

@@ -2,18 +2,13 @@
 title: "Debugging and Listings for Inline Assembly | Microsoft Docs"
 ms.custom: ""
 ms.date: "11/04/2016"
-ms.reviewer: ""
-ms.suite: ""
-ms.technology: ["cpp-tools"]
-ms.tgt_pltfrm: ""
-ms.topic: "article"
+ms.technology: ["cpp-masm"]
+ms.topic: "conceptual"
 dev_langs: ["C++"]
 helpviewer_keywords: ["source level debugger", "__asm keyword [C++], debugging", "inline assembly, listings", "bugs, __asm blocks", "debugging [C++], inline assembly code", "inline assembly, debugging"]
 ms.assetid: 69266930-6f9a-433d-b704-f4f44e7b2583
-caps.latest.revision: 7
 author: "corob-msft"
 ms.author: "corob"
-manager: "ghogen"
 ms.workload: ["cplusplus"]
 ---
 # Debugging and Listings for Inline Assembly