Skip to content

Commit eb3e81a

Browse files
mdseboltmdsebolt
committed
merge conflict resolve
2 parents 75b2bf3 + 009c7ce commit eb3e81a

10,006 files changed

Lines changed: 75543 additions & 136931 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.acrolinx-config.edn‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{:allowed-branchname-matches ["^master$" "^release..*"]
2+
:allowed-filename-matches ["docs" "styleguide"]
3+
4+
:template-header
5+
"
6+
## Acrolinx Scorecards
7+
8+
Click the scorecard links for each article to review the Acrolinx feedback on grammar, spelling, punctuation, writing style, and terminology:
9+
10+
| Article | Score | Issues | Scorecard |
11+
| ------- | ----- | ------ | --------- |
12+
"
13+
14+
;; do not remove the spaces at the end of lines! That is markdown for
15+
;; linebreak
16+
:template-change
17+
"| **${github/filename}** | ${acrolinx/qualityscore} | ${acrolinx/flags/issues} | [link](${acrolinx/scorecard}) |
18+
"
19+
20+
:template-footer
21+
"
22+
**More info about Acrolinx**
23+
24+
- [Install Acrolinx locally for VSCode](https://review.docs.microsoft.com/en-us/help/contribute/contribute-acrolinx-vscode)
25+
- [Report false positives or issues](https://aka.ms/acrolinxbug)
26+
27+
"}

‎.openpublishing.redirection.json‎

Lines changed: 7378 additions & 3539 deletions
Large diffs are not rendered by default.

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ The Visual Studio team will review your PR and let you know if the change looks
5252

5353
The maintainers will merge your PR into the master branch once feedback has been applied and your change looks good.
5454

55-
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/).
55+
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/cpp/).
5656

5757
## DOs and DON'Ts
5858

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ Welcome! This repository contains source files for the work-in-progress Visual C
44

55
This repository was moved from Microsoft/vcppdocs to MicrosoftDocs/cpp-docs-pr on June 23, 2017.
66

7-
The documentation for Visual Basic and Visual C# are located in a separate repository at [http://github.com/dotnet/core-docs](http://github.com/dotnet/core-docs), and the Visual Studio 2017 documentation is located in the repository located at [http://github.com/Microsoft/visualstudio-docs](http://github.com/Microsoft/visualstudio-docs).
7+
The documentation for Visual Basic and Visual C# are located in a separate repository at [https://github.com/dotnet/core-docs](https://github.com/dotnet/core-docs), and the Visual Studio 2017 documentation is located in the repository located at [https://github.com/Microsoft/visualstudio-docs](https://github.com/Microsoft/visualstudio-docs).
88

99
## Contributing to the documentation
1010

11-
We welcome your contributions to help us improve the Visual C++ docs. For a comprehensive guide to contributing to docs.microsoft.com, please see the [Microsoft Docs contributor guide overview](https://docs.microsoft.com/contribute). For details on how to make a contribution to the Visual C++ documentation, please see the [Contributing](CONTRIBUTING.md) guide.
11+
We welcome your contributions to help us improve the Visual C++ docs. For a comprehensive guide to contributing to docs.microsoft.com, please see the [Microsoft Docs contributor guide overview](https://docs.microsoft.com/contribute). For details on how to make a contribution to the Visual C++ documentation, please see the [Contributing guide](CONTRIBUTING.md).
1212

13-
Several feature areas of Visual C++ have their own folders in this repository, such as `standard-library` for topics on the C++ Standard Library, `ide` for C++-specific 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](CONTRIBUTING.md) guide has more information.
13+
Several feature areas of Visual C++ have their own folders in this repository, such as `standard-library` for topics on the C++ Standard Library, `ide` for C++-specific 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.
1414

1515
## Microsoft Open Source Code of Conduct
1616

‎docs/TOC.md‎

Lines changed: 47 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,50 @@
1-
# [Visual C++ in Visual Studio 2017](visual-cpp-in-visual-studio.md)
2-
# [What's New for Visual C++ in Visual Studio 2017](what-s-new-for-visual-cpp-in-visual-studio.md)
3-
# [Visual C++ Tutorial](build/vscpp-step-0-installation.md)
1+
# [C++ in Visual Studio](overview/visual-cpp-in-visual-studio.md)
2+
## [Overview of C++ development in Visual Studio](overview/overview-of-cpp-development.md)
3+
## [What's new for C++ in Visual Studio](overview/what-s-new-for-visual-cpp-in-visual-studio.md)
4+
## [C++ conformance improvements in Visual Studio](overview/cpp-conformance-improvements.md)
5+
## [Microsoft C++ language conformance](overview/visual-cpp-language-conformance.md)
6+
## [Supported platforms](overview/supported-platforms-visual-cpp.md)
7+
## [Visual C++ Tools and Features in Visual Studio Editions](overview/visual-cpp-tools-and-features-in-visual-studio-editions.md)
8+
## [Samples](overview/visual-cpp-samples.md)
9+
## [Help and community](overview/visual-cpp-help-and-community.md)
10+
## [How to report a problem with the Visual C++ toolset](overview/how-to-report-a-problem-with-the-visual-cpp-toolset.md)
11+
# Visual C++ Tutorials
412
## [Install C++ support in Visual Studio](build/vscpp-step-0-installation.md)
513
## [Create a C++ console app project](build/vscpp-step-1-create.md)
614
## [Build and run a C++ console app project](build/vscpp-step-2-build.md)
7-
# [C++ conformance improvements in Visual Studio 2017](cpp-conformance-improvements-2017.md)
8-
## [Visual C++ Language Conformance](visual-cpp-language-conformance.md)
9-
# [Supported Platforms (Visual C++)](supported-platforms-visual-cpp.md)
10-
# [C Language](c-language/c-language-reference.md)
11-
# [C++ Language](cpp/cpp-language-reference.md)
12-
# [C/C++ Preprocessor](preprocessor/c-cpp-preprocessor-reference.md)
13-
# [C Runtime Library](c-runtime-library/c-run-time-library-reference.md)
14-
# [C++ Standard Library](standard-library/cpp-standard-library-reference.md)
15-
# [Windows Development](windows/overview-of-windows-programming-in-cpp.md)
16-
# [Linux Development](linux/download-install-and-setup-the-linux-development-workload.md)
17-
# [Cloud and Web Programming in Visual C++](cloud/cloud-and-web-programming-in-visual-cpp.md)
18-
# [Parallel Programming](parallel/parallel-programming-in-visual-cpp.md)
19-
# [Data Access](data/data-access-in-cpp.md)
20-
# [Text and Strings](text/text-and-strings-in-visual-cpp.md)
21-
# [vcpkg: A Package Manager for C++](vcpkg.md)
22-
# [IDE and Tools for Visual C++](ide/ide-and-tools-for-visual-cpp-development.md)
23-
# [Compilers and Build Tools](build/building-c-cpp-programs.md)
24-
# [Porting and Upgrading Visual C++ Code](porting/visual-cpp-porting-and-upgrading-guide.md)
25-
# [Security Best Practices for C++](security/security-best-practices-for-cpp.md)
26-
## [Running as a Member of the Users Group](security/running-as-a-member-of-the-users-group.md)
27-
## [How User Account Control (UAC) Affects Your Application](security/how-user-account-control-uac-affects-your-application.md)
28-
## [C++ Developer Guidance for Speculative Execution Side Channels](security/developer-guidance-speculative-execution.md)
29-
# [Visual C++ Samples](visual-cpp-samples.md)
30-
# [Visual C++ Help and Community](visual-cpp-help-and-community.md)
31-
# [How to Report a Problem with the Visual C++ Toolset](how-to-report-a-problem-with-the-visual-cpp-toolset.md)
15+
# [Projects and Build Systems](build/projects-and-build-systems-cpp.md)
16+
# [Writing and refactoring code](ide/writing-and-refactoring-code-cpp.md)
17+
# [Windows desktop development](windows/overview-of-windows-programming-in-cpp.md)
18+
# [UWP development](cppcx/universal-windows-apps-cpp.md)
19+
# [Game development](overview/game-development-cpp.md)
20+
# [Linux development](linux/download-install-and-setup-the-linux-development-workload.md)
21+
# [Cross-platform Mobile Development](/visualstudio/cross-platform/visual-cpp-for-cross-platform-mobile-development)
22+
# [.NET development with C++/CLI](dotnet/dotnet-programming-with-cpp-cli-visual-cpp.md)
23+
# [Cloud and Web programming](cloud/cloud-and-web-programming-in-visual-cpp.md)
24+
# [Port and upgrade C++ code](porting/visual-cpp-porting-and-upgrading-guide.md)
25+
# [Security best practices for C++](security/security-best-practices-for-cpp.md)
26+
## [Running as a member of the users group](security/running-as-a-member-of-the-users-group.md)
27+
## [How User Account Control (UAC) affects your application](security/how-user-account-control-uac-affects-your-application.md)
28+
## [C++ developer guidance for speculative execution side channels](security/developer-guidance-speculative-execution.md)
29+
# Reference
30+
## [Languages](overview/languages-cpp.md)
31+
### [C language](c-language/c-language-reference.md)
32+
### [C++ language](cpp/cpp-language-reference.md)
33+
### [C/C++ preprocessor](preprocessor/c-cpp-preprocessor-reference.md)
34+
### [Compiler intrinsics and assembly language](intrinsics/compiler-intrinsics-and-assembly-language.md)
35+
### [C Runtime Library](c-runtime-library/c-run-time-library-reference.md)
36+
### [Component extensions for .NET and UWP](extensions/component-extensions-for-runtime-platforms.md)
37+
### [C++ attributes for COM and .NET](windows/attributes/cpp-attributes-com-net.md)
38+
## [Libraries](overview/libraries-cpp.md)
39+
### [C Runtime Library](c-runtime-library/c-run-time-library-reference.md)
40+
### [C++ Standard Library](standard-library/cpp-standard-library-reference.md)
41+
### [SafeInt library](safeint/safeint-library.md)
42+
#### [SafeInt Class](safeint/safeint-class.md)
43+
#### [SafeInt Functions](safeint/safeint-functions.md)
44+
#### [SafeIntException Class](safeint/safeintexception-class.md)
45+
### [OpenMP](parallel/openmp/openmp-in-visual-cpp.md)
46+
### [MFC/ATL](mfc/mfc-and-atl.md)
47+
### [Parallel libraries](parallel/parallel-programming-in-visual-cpp.md)
48+
### [Data access libraries](data/data-access-in-cpp.md)
49+
50+

‎docs/_breadcrumb/toc.yml‎

Lines changed: 27 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
items:
99
- name: Documentation
1010
tocHref: /cpp/
11-
topicHref: /cpp/visual-cpp-in-visual-studio
11+
topicHref: /cpp/overview/visual-cpp-in-visual-studio
1212
items:
1313
- name: C++ Language
1414
tocHref: /cpp/cpp/
@@ -19,6 +19,19 @@
1919
- name: C/C++ Preprocessor
2020
tocHref: /cpp/preprocessor/
2121
topicHref: /cpp/c-cpp-preprocessor-reference
22+
- name: Compiler Intrinsics and Assembly Language
23+
tocHref: /cpp/intrinsics/
24+
topicHref: /cpp/intrinsics/compiler-intrinsics-and-assembly-language
25+
items:
26+
- name: ARM
27+
tocHref: /cpp/assembler/arm/
28+
topicHref: /cpp/assembler/arm/arm-assembler-reference
29+
- name: Inline assembler
30+
tocHref: /cpp/assembler/inline/
31+
topicHref: /cpp/assembler/inline-assembler
32+
- name: MASM
33+
tocHref: /cpp/assembler/masm/
34+
topicHref: /cpp/assembler/masm/microsoft-macro-assembler-reference
2235
- name: C Runtime Library
2336
tocHref: /cpp/c-runtime-library/
2437
topicHref: /cpp/c-runtime-library/c-run-time-library-reference
@@ -36,10 +49,6 @@
3649
- name: ATL
3750
tocHref: /cpp/atl/
3851
topicHref: /cpp/atl/atl-com-desktop-components
39-
items:
40-
- name: Reference
41-
tocHref: /cpp/atl/reference/
42-
topicHref: /cpp/atl/reference/atl-classes
4352
- name: MFC
4453
tocHref: /cpp/mfc/
4554
topicHref: /cpp/mfc/mfc-desktop-applications
@@ -76,43 +85,24 @@
7685
- name: ODBC
7786
tocHref: /cpp/data/odbc/
7887
topicHref: /cpp/data/odbc/open-database-connectivity-odbc
79-
- name: IDE and Tools
80-
tocHref: /cpp/ide/
81-
topicHref: /cpp/ide/ide-and-tools-for-visual-cpp-development
88+
- name: Edit, navigate, and refactor code
89+
tocHref: /cpp/ide
90+
topicHref: /cpp/overview-of-cpp-development
8291
items:
8392
- name: IDE
8493
tocHref: /cpp/ide/
8594
topicHref: /cpp/ide/using-the-visual-studio-ide-for-cpp-desktop-development
86-
- name: Building
87-
tocHref: /cpp/build/
88-
tocHref: /cpp/build/building-c-cpp-programs
89-
items:
90-
- name: Build Reference
91-
tocHref: /cpp/build/reference/
92-
topicHref: /cpp/build/reference/c-cpp-building-reference
93-
items:
94-
- name: Compiler Errors
95-
tocHref: /cpp/error-messages/compiler-errors-1/
96-
topicHref: /cpp/compiler-errors-1/c-cpp-build-errors
97-
- name: Compiler Warnings
98-
tocHref: /cpp/compiler-warnings/
99-
topicHref: /cpp/compiler-warnings/compiler-warnings-c4000-through-C4199
100-
- name: Other Tools
101-
tocHref: /cpp/error-messages/tool-errors/
102-
topicHref: /cpp/error-messages/tool-errors/vectorizer-and-parallelizer-messages
103-
- name: Compiler Intrinsics and Assembly Language
104-
tocHref: /cpp/intrinsics/
105-
topicHref: /cpp/intrinsics/compiler-intrinsics-and-assembly-language
95+
- name: Building C/C++ Projects
96+
tocHref: /cpp/build/
97+
tocHref: /cpp/build/building-c-cpp-programs
98+
items:
99+
- name: Build Reference
100+
tocHref: /cpp/build/reference/
101+
topicHref: /cpp/build/reference/c-cpp-building-reference
106102
items:
107-
- name: ARM
108-
tocHref: /cpp/assembler/arm/
109-
topicHref: /cpp/assembler/arm/arm-assembler-reference
110-
- name: Inline assembler
111-
tocHref: /cpp/assembler/inline/
112-
topicHref: /cpp/assembler/inline-assembler
113-
- name: MASM
114-
tocHref: /cpp/assembler/masm/
115-
topicHref: /cpp/assembler/masm/microsoft-macro-assembler-reference
103+
- name: Compiler and tool errors and warnings
104+
tocHref: /cpp/error-messages/
105+
topicHref: /cpp/error-messages/compiler-errors-1/c-cpp-build-errors
116106
- name: Porting and Upgrading
117107
tocHref: /cpp/porting/
118108
topicHref: /cpp/porting/visual-cpp-porting-and-upgrading-guide

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
11
---
2-
title: "ARM Assembler Command-Line Reference | Microsoft Docs"
3-
ms.custom: ""
2+
title: "ARM Assembler Command-Line Reference"
43
ms.date: "08/30/2018"
5-
ms.technology: ["cpp-masm"]
6-
ms.topic: "reference"
7-
dev_langs: ["C++"]
84
ms.assetid: f7b89478-1ab5-4995-8cde-a805f0462c45
9-
author: "corob-msft"
10-
ms.author: "corob"
11-
ms.workload: ["cplusplus"]
125
---
136
# ARM Assembler Command-Line Reference
147

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
11
---
2-
title: "ARM Assembler diagnostic messages | Microsoft Docs"
3-
ms.custom: ""
2+
title: "ARM Assembler diagnostic messages"
43
ms.date: "08/30/2018"
5-
ms.technology: ["cpp-masm"]
6-
ms.topic: "reference"
74
f1_keywords: ["A2193", "A2196", "A2202", "A2513", "A2557", "A4228", "A4508", "A4509"]
85
helpviewer_keywords: ["A2193", "A2196", "A2202", "A2513", "A2557", "A4228", "A4508", "A4509"]
9-
dev_langs: ["C++"]
106
ms.assetid: 52b38267-6023-4bdc-a0ef-863362f48eec
11-
author: "corob-msft"
12-
ms.author: "corob"
13-
ms.workload: ["cplusplus"]
147
---
158
# ARM Assembler diagnostic messages
169

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
11
---
2-
title: "ARM Assembler Directives | Microsoft Docs"
3-
ms.custom: ""
2+
title: "ARM Assembler Directives"
43
ms.date: "08/30/2018"
5-
ms.technology: ["cpp-masm"]
6-
ms.topic: "reference"
7-
dev_langs: ["C++"]
84
ms.assetid: 9cfa8896-ec10-4e77-855a-3135c40d7d2a
9-
author: "corob-msft"
10-
ms.author: "corob"
11-
ms.workload: ["cplusplus"]
125
---
136
# ARM Assembler Directives
147

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
11
---
2-
title: "ARM Assembler Reference | Microsoft Docs"
3-
ms.custom: ""
2+
title: "ARM Assembler Reference"
43
ms.date: "08/28/2017"
5-
ms.technology: ["cpp-masm"]
6-
ms.topic: "reference"
7-
dev_langs: ["C++"]
84
ms.assetid: f8a076cc-9627-4328-a34a-9c44f7a3aab1
9-
author: "corob-msft"
10-
ms.author: "corob"
11-
ms.workload: ["cplusplus"]
125
---
136
# ARM Assembler Reference
147

0 commit comments

Comments
 (0)