Resolve syncing conflicts from master-sync-work to master

.openpublishing.publish.config.json

@@ -10,6 +10,7 @@
       "locale": "en-us",
       "version": 0,
       "open_to_public_contributors": true,
+      "git_repository_url_open_to_public_contributors": "https://github.com/Microsoft/cpp-docs",
       "type_mapping": {
         "Conceptual": "Content",
         "ManagedReference": "Content",
@@ -30,4 +31,4 @@
     }
   ],
   "need_generate_pdf_url_template": false
-}
+}

CONTRIBUTING.md

@@ -0,0 +1,95 @@
+# Contributing
+
+Thank you for your interest in contributing to the Visual C++ documentation!
+
+In this topic, you'll see the basic process for adding or updating content in the [Visual C++ documentation site](https://docs.microsoft.com/cpp-docs).
+
+In this topic, we'll cover:
+
+* [Process for contributing](#process-for-contributing)
+* [Guidance checklist](#guidance-checklist)
+* [Building the docs](#building-the-docs)
+* [Contributing to samples](#contributing-to-samples)
+* [Contributor License Agreement](#contributor-license-agreement)
+
+## 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. 
+
+You can skip this first step for small changes.
+
+**Step 2:** Fork the `Microsoft/cpp-docs` repo.
+
+**Step 3:** Create a `branch` for your article.
+
+**Step 4:** Write your article.
+
+If it's a new topic, you can use this [template file](./styleguide/template.md) as your starting point. It contains the writing guidelines and also explains the metadata required for each article, such as author information.
+
+Navigate to the folder that corresponds to the TOC location determined for your article in step 1.
+That folder contains the Markdown files for all articles in that section. If necessary, create a new folder to place the files for your content.
+
+For images and other static resources, add them to the subfolder called **media**. If you are creating a new folder for content, add a media folder to the new folder.
+
+Be sure to follow the proper Markdown syntax. See the [style guide](./styleguide/template.md) for more information.
+
+### Example structure
+
+    docs
+      /standard-library
+          wstring-convert-class.md
+          /media
+              wstring-conversion.png
+
+**Step 5:** Submit a Pull Request (PR) from your branch to `Microsoft/cpp-docs/master`.
+
+If your PR is addressing an existing issue, add the `Fixes #Issue_Number` keyword to the commit message or PR description, so the issue can be automatically closed when the PR is merged. For more information, see [Closing issues via commit messages](https://help.github.com/articles/closing-issues-via-commit-messages/).
+
+The Visual Studio team will review your PR and let you know if the change looks good or if there are any other updates/changes necessary in order to approve it.
+
+**Step 6:** Make any necessary updates to your branch as discussed with the team.
+
+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/cpp-docs/.
+
+## DOs and DON'Ts
+
+Below is a short list of guiding rules that you should keep in mind when you are contributing to the .NET documentation.
+
+- **DON'T** surprise us with big pull requests. Instead, file an issue and start a discussion so we can agree on a direction before you invest a large amount of time.
+- **DO** read the [style guide](./styleguide/template.md) and [voice and tone](./styleguide/voice-tone.md) guidelines.
+- **DO** use the [template](./styleguide/template.md) file as the starting point of your work.
+- **DO** create a separate branch on your fork before working on the articles.
+- **DO** follow the [GitHub Flow workflow](https://guides.github.com/introduction/flow/).
+- **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.
+
+## Building the docs
+
+The documentation is written in [GitHub Flavored Markdown](https://help.github.com/categories/writing-on-github/) and built using [DocFX](http://dotnet.github.io/docfx/) and other internal publishing/building tools. It is hosted at [docs.microsoft.com](https://docs.microsoft.com/dotnet).
+
+If you want to build the docs locally, you need to install [DocFX](https://dotnet.github.io/docfx/); latest versions are the best.
+
+There are several ways to use DocFX, and most of them are covered in the [DocFX getting started guide](https://dotnet.github.io/docfx/tutorial/docfx_getting_started.html).
+The following instructions use the [command-line based](https://dotnet.github.io/docfx/tutorial/docfx_getting_started.html#2-use-docfx-as-a-command-line-tool) version of the tool.
+If you are comfortable with other ways listed on the link above, feel free to use those.
+
+**Note:** Currently DocFX requires the .NET Framework on Windows or Mono (for Linux or macOS). We hope to port it to .NET Core in the future.
+
+You can build and preview the resulting site locally using a built-in web server. Navigate to the core-docs folder on your machine and type the following command:
+
+```
+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/articles/welcome.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.
+
+# 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.

README.md

@@ -0,0 +1,14 @@
+# Visual Studio 2017 RC documentation for Visual C++
+
+Welcome! This repo contains source files for the work-in-progress Visual C++ RC technical documentation. The topics are published on the [Visual Studio documentation site](https://docs.microsoft.com/cpp-docs).
+
+The documentation for Visual Basic and Visual C# are located in a separate repo at [http://github.com/dotnet/core-docs](http://github.com/dotnet/core-docs), and the Visual C++ documentation is located in the repo located at [http://github.com/Microsoft/cpp-docs](http://github.com/Microsoft/cpp-docs).
+
+## Contributing to the documentation
+
+To contribute to this documentation, please see the [Contributing guide](CONTRIBUTING.md).
+We welcome your contributions to help us improve the Visual Studio docs. All the articles in this repository use GitHub flavored markdown.
+
+Several feature areas of Visual Studio have their own folders in this repo, such as **debugger** for topics on debugging, **ide** for topics on the Visual Studio interactive development environment (IDE), and so forth. The **/media** subfolder in each folder contains art files for the topics. The [Contributing guide](CONTRIBUTING.md) has more information.
+
+This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.

docs/TOC.md

@@ -1,26 +1,25 @@
-# [Visual C++ in Visual Studio 2017 RC](top/visual-cpp-in-visual-studio.md)
-# [What's New for Visual C++ in Visual Studio 2017 RC](top/what-s-new-for-visual-cpp-in-visual-studio.md)
-# [Supported Platforms (Visual C++)](top/supported-platforms-visual-cpp.md)
-# [C Language](c-language\TOC.md)
-# [C++ Language](cpp\TOC.md)
-# [C/C++ Preprocessor](preprocessor\TOC.md)
-# [C Runtime Library](c-runtime-library\TOC.md)
-# [C++ Standard Library](standard-library\TOC.md)
-# [Windows Development](windows\TOC.md)
-# [Linux Development](linux\TOC.md)
-# [.NET Development](dotnet\TOC.md)
-# [Cloud and Web Programming in Visual C++](top/cloud-and-web-programming-in-visual-cpp.md)
-## [C++ REST SDK (Codename "Casablanca")](top/cpp-rest-sdk-codename-casablanca.md)
-# [Parallel Programming](parallel\TOC.md)
-# [Data Access](data\TOC.md)
-# [Text and Strings](text\TOC.md)
-# [Using the Visual Studio IDE for C++](ide\TOC.md)
-# [Compilers and Build Tools](build/TOC.md)
-# [Porting and Upgrading Visual C++ Code](porting\TOC.md)
-# [Security Best Practices for C++](top/security-best-practices-for-cpp.md)
-## [Running as a Member of the Users Group](top/running-as-a-member-of-the-users-group.md)
-## [How User Account Control (UAC) Affects Your Application](top/how-user-account-control-uac-affects-your-application.md)
-# [Visual C++ Samples](top/visual-cpp-samples.md)
-# [Visual C++ Help and Community](top/visual-cpp-help-and-community.md)
-# [How to Report a Problem with the Visual C++ Toolset](top/how-to-report-a-problem-with-the-visual-cpp-toolset.md)
-
+# [Visual C++ in Visual Studio 2017 RC](top/visual-cpp-in-visual-studio.md)
+# [What's New for Visual C++ in Visual Studio 2017 RC](top/what-s-new-for-visual-cpp-in-visual-studio.md)
+# [Supported Platforms (Visual C++)](top/supported-platforms-visual-cpp.md)
+# [C Language](c-language/c-language-reference.md)
+# [C++ Language](cpp/cpp-language-reference.md)
+# [C/C++ Preprocessor](preprocessor/c-cpp-preprocessor-reference.md)
+# [C Runtime Library](c-runtime-library/c-run-time-library-reference.md)
+# [C++ Standard Library](standard-library/cpp-standard-library-reference.md)
+# [Windows Development](windows/overview-of-windows-programming-in-cpp.md)
+# [Linux Development](linux/download-install-and-setup-the-linux-development-workload.md)
+# [.NET Development with C++/CLI](dotnet/dotnet-programming-with-cpp-cli-visual-cpp.md)
+# [Cloud and Web Programming in Visual C++](top/cloud-and-web-programming-in-visual-cpp.md)
+## [C++ REST SDK (Codename "Casablanca")](top/cpp-rest-sdk-codename-casablanca.md)
+# [Parallel Programming](parallel/parallel-programming-in-visual-cpp.md)
+# [Data Access](data/data-access-programming-mfc-atl.md)
+# [Text and Strings](text/text-and-strings-in-visual-cpp.md)
+# [Using the Visual Studio IDE for C++](ide/ide-and-tools-for-visual-cpp-development.md)
+# [Compilers and Build Tools](build/building-c-cpp-programs.md)
+# [Porting and Upgrading Visual C++ Code](porting/visual-cpp-porting-and-upgrading-guide.md)
+# [Security Best Practices for C++](top/security-best-practices-for-cpp.md)
+## [Running as a Member of the Users Group](top/running-as-a-member-of-the-users-group.md)
+## [How User Account Control (UAC) Affects Your Application](top/how-user-account-control-uac-affects-your-application.md)
+# [Visual C++ Samples](top/visual-cpp-samples.md)
+# [Visual C++ Help and Community](top/visual-cpp-help-and-community.md)
+# [How to Report a Problem with the Visual C++ Toolset](top/how-to-report-a-problem-with-the-visual-cpp-toolset.md)

docs/_breadcrumb/toc.yml

@@ -0,0 +1,116 @@
+- name: Docs
+  tocHref: /
+  topicHref: /
+  items:
+  - name: Visual C++
+    tocHref: /cpp/
+    topicHref: /cpp/top/visual-cpp-in-visual-studio
+    items:
+    - name: C++ Language
+      tocHref: /cpp/cpp/
+      topicHref: /cpp/cpp/cpp-language-reference
+    - name: C Language
+      tocHref: /cpp/c-language/
+      topicHref: /cpp/c-language/c-language-reference
+    - name: C/C++ Preprocessor
+      tocHref: /cpp/preprocessor/
+      topicHref: /cpp/c-cpp-preprocessor-reference
+    - name: C Runtime Library
+      tocHref: /cpp/c-runtime-library/
+      topicHref: /cpp/c-runtime-library/c-runtime-library-reference
+      items:
+      - name: Reference
+        tocHref: /cpp/c-runtime-library/reference/
+        topicHref: /cpp/c-runtime-library/reference/alphabetical-function-reference
+    - name: C++ Standard Library
+      tocHref: /cpp/standard-library/
+      topicHref: /cpp/standard-library/cpp-standard-library 
+    - name: Windows
+      tocHref: /cpp/windows/
+      topicHref: /cpp/windows/overview-of-windows-programming-in-cpp
+      items:
+      - name: ATL
+        tocHref: /cpp/atl/
+        topicHref: /cpp/atl/atl-com-desktop-components
+        items:
+        - name: Reference
+          tocHref: /cpp/atl/reference/
+          topicHref: /cpp/atl/reference/atl-classes
+      - name: MFC
+        tocHref: /cpp/mfc/
+        topicHref: /cpp/mfc/mfc-desktop-applications
+        items:
+        - name: Reference
+          tocHref: /cpp/mfc/reference/
+          topicHref: /cpp/mfc/reference/mfc-classes
+      - name: ATL/MFC Shared Classes
+        tocHref: /cpp/atl-mfc-shared/
+        topicHref: /cpp/atl-mfc-shared/atl-mfc-shared-classes
+        items:
+        - name: Reference
+          tocHref: /cpp/atl-mfc-shared/reference/
+          topicHref: /cpp/atl-mfc/shared/reference/classes-shared-by-atl-and-mfc
+    - name: Linux
+      tocHref: /cpp/linux/
+      topicHref: /cpp/linux/download-install-and-setup-the-linux-development-workload
+    - name: .NET
+      tocHref: /cpp/dotnet/
+      topicHref: /cpp/dotnet/dotnet-programming-with-cpp-cli
+    - name: Parallel Programming
+      tocHref: /cpp/parallel/
+      topicHref: /cpp/parallel/parallel-programming-in-visual-cpp
+    - name: Data Access
+      tocHref: /cpp/data/
+      topicHref: /cpp/data/data-access
+      items:
+      - name: OLEDB
+        tocHref: /cpp/data/oledb/
+        topicHref:   /cpp/data/oledb/ole-db-programming
+      - name: ODBC
+        tocHref: /cpp/data/odbc/
+        topicHref: /cpp/data/odbc/open-database-connectivity-odbc
+      - name: ADO and RDO
+        tocHref: /cpp/data/ado-rdo/
+        topicHref: /cpp/data/ado-rdo/data-bound-controls-ado-and-rdo
+    - name: IDE and Tools
+      tocHref: /cpp/ide/
+      topicHref: /cpp/ide/ide-and-tools-for-visual-cpp-development
+      items:
+      - name: IDE
+        tocHref: /cpp/ide/
+        topicHref: /cpp/ide/using-the-visual-studio-ide-for-cpp-desktop-development
+      - name: Building
+        tocHref: /cpp/build/
+        tocHref: /cpp/build/building-c-cpp-programs
+      - name: Compiler Intrinsics and Assembly Language
+        tocHref: /cpp/intrinsics/
+        topicHref: /cpp/intrinsics/c-cpp-intrinsics
+        items:
+        - name: ARM
+          tocHref: /cpp/assembler/arm/
+          topicHref: /cpp/assembler/arm/arm-assembler-reference
+        - name: Inline assembler
+          tocHref: /cpp/assembler/inline/
+          topicHref: /cpp/assembler/inline-assembler-reference
+        - name: MASM
+          tocHref: /cpp/assembler/masm/
+          topicHref: /cpp/assembler/masm/microsoft-macro-assembler-reference
+        - name: Build Reference
+          tocHref: /cpp/build/reference/
+          topicHref: /cpp/build/reference/c-cpp-building-reference
+          items:
+          - name: Compiler Errors
+            tocHref: /cpp/error-messages/compiler-errors-1/
+            topicHref: /cpp/compiler-errors-1/c-cpp-build-errors
+          - name: Compiler Warnings
+            tocHref: /cpp/compiler-warnings/
+            topicHref: /cpp/compiler-warnings/compiler-warnings-c4000-through-C4199
+          - name: Other Tools
+            tocHref: /cpp/error-messages/tool-errors/
+            topicHref: /cpp/error-messages/tool-errors/vectorizer-and-parallelizer-messages
+    - name: Porting and Upgrading
+      tocHref: /cpp/porting/
+      topicHref: /cpp/porting/porting-and-upgrading-guide
+    - name: Text and Strings
+      tocHref: /cpp/text/
+      topicHref: /cpp/text/text-and-strings

docs/assembler/arm/TOC.md

@@ -1,4 +1,4 @@
-# [ARM Assembler Reference](arm-assembler-reference.md)
-## [ARM Assembler Command-Line Reference](arm-assembler-command-line-reference.md)
-## [ARM Assembler Diagnostic Messages](arm-assembler-diagnostic-messages.md)
-## [ARM Assembler Directives](arm-assembler-directives.md)
+# [ARM Assembler Reference](arm-assembler-reference.md)
+## [ARM Assembler Command-Line Reference](arm-assembler-command-line-reference.md)
+## [ARM Assembler Diagnostic Messages](arm-assembler-diagnostic-messages.md)
+## [ARM Assembler Directives](arm-assembler-directives.md)

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

@@ -1,37 +1,36 @@
----
-title: "ARM Assembler Command-Line Reference | Microsoft Docs"
-ms.custom: ""
-ms.date: "11/04/2016"
-ms.prod: "visual-studio-dev14"
-ms.reviewer: ""
-ms.suite: ""
-ms.technology: 
-  - "devlang-cpp"
-ms.tgt_pltfrm: ""
-ms.topic: "article"
-dev_langs: 
-  - "C++"
-ms.assetid: f7b89478-1ab5-4995-8cde-a805f0462c45
-caps.latest.revision: 12
-author: "corob-msft"
-ms.author: "corob"
-manager: "ghogen"
-translation.priority.ht: 
-  - "cs-cz"
-  - "de-de"
-  - "es-es"
-  - "fr-fr"
-  - "it-it"
-  - "ja-jp"
-  - "ko-kr"
-  - "pl-pl"
-  - "pt-br"
-  - "ru-ru"
-  - "tr-tr"
-  - "zh-cn"
-  - "zh-tw"
----
-# ARM Assembler Command-Line Reference
+---
+title: "ARM Assembler Command-Line Reference | Microsoft Docs"
+ms.custom: ""
+ms.date: "11/04/2016"
+ms.reviewer: ""
+ms.suite: ""
+ms.technology: 
+  - "devlang-cpp"
+ms.tgt_pltfrm: ""
+ms.topic: "article"
+dev_langs: 
+  - "C++"
+ms.assetid: f7b89478-1ab5-4995-8cde-a805f0462c45
+caps.latest.revision: 12
+author: "corob-msft"
+ms.author: "corob"
+manager: "ghogen"
+translation.priority.ht: 
+  - "cs-cz"
+  - "de-de"
+  - "es-es"
+  - "fr-fr"
+  - "it-it"
+  - "ja-jp"
+  - "ko-kr"
+  - "pl-pl"
+  - "pt-br"
+  - "ru-ru"
+  - "tr-tr"
+  - "zh-cn"
+  - "zh-tw"
+---
+# ARM Assembler Command-Line Reference
 This article provides command-line information about the Microsoft ARM assembler, *armasm*, which compiles ARMv7 Thumb assembly language into the Microsoft implementation of the Common Object File Format (COFF). The linker can link COFF code with object code that is produced by the ARM assembler or by the C compiler, together with object libraries that are created by the librarian.  
 
 ## Syntax