Skip to content

Commit 9a5e0d9

Browse files
author
Colin Robertson
authored
Merge branch 'master' into cpp-reconcile-pr12
2 parents 1034f30 + 69893dd commit 9a5e0d9

612 files changed

Lines changed: 23023 additions & 12376 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.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ _themes.MSDN.Modern/
77
_themes.VS.Modern/
88

99
.openpublishing.buildcore.ps1
10+
.vscode/
1011

1112
# Documentation build
1213
/docs/vcppdocs

.openpublishing.redirection.json

Lines changed: 371 additions & 21 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
1-
# Visual Studio 2017 documentation for Visual C++
1+
# Visual Studio documentation for Microsoft C++
22

3-
Welcome! This repository contains source files for the work-in-progress Visual C++ technical documentation. The topics are published on the [Visual C++ documentation site](https://docs.microsoft.com/cpp).
3+
Welcome! This repository contains source files for the work-in-progress Microsoft C++ (MSVC or Visual C++) technical documentation. The articles are published on the [C++ in Visual Studio documentation site](https://docs.microsoft.com/cpp).
44

5-
This repository was moved from Microsoft/vcppdocs to MicrosoftDocs/cpp-docs-pr on June 23, 2017.
6-
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).
5+
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 documentation is located in the repository located at [https://github.com/Microsoft/visualstudio-docs](https://github.com/Microsoft/visualstudio-docs).
86

97
## Contributing to the documentation
108

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).
9+
We welcome your contributions to help us improve the MSVC docs. For a comprehensive guide to contributing to docs.microsoft.com, see the [Microsoft Docs contributor guide overview](https://docs.microsoft.com/contribute). For details on how to make a contribution to the MSVC documentation, see the [Contributing guide](CONTRIBUTING.md).
1210

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.
11+
Several feature areas of MSVC have their own folders in this repository, such as `standard-library` for articles on the C++ Standard Library, `ide` for C++-specific articles on the Visual Studio interactive development environment (IDE), and so forth. The `/media` subfolder in each folder contains art files for the articles. The [Contributing guide](CONTRIBUTING.md) has more information.
1412

1513
## Microsoft Open Source Code of Conduct
1614

17-
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 [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
15+
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 [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.

docs/TOC.md

Lines changed: 0 additions & 50 deletions
This file was deleted.

docs/_breadcrumb/toc.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,6 @@
4949
- name: ATL
5050
tocHref: /cpp/atl/
5151
topicHref: /cpp/atl/atl-com-desktop-components
52-
items:
53-
- name: Reference
54-
tocHref: /cpp/atl/reference/
55-
topicHref: /cpp/atl/reference/atl-classes
5652
- name: MFC
5753
tocHref: /cpp/mfc/
5854
topicHref: /cpp/mfc/mfc-desktop-applications
@@ -89,7 +85,7 @@
8985
- name: ODBC
9086
tocHref: /cpp/data/odbc/
9187
topicHref: /cpp/data/odbc/open-database-connectivity-odbc
92-
- name: Edit, navigate and refactor code
88+
- name: Edit, navigate, and refactor code
9389
tocHref: /cpp/ide
9490
topicHref: /cpp/overview-of-cpp-development
9591
items:
@@ -98,7 +94,7 @@
9894
topicHref: /cpp/ide/using-the-visual-studio-ide-for-cpp-desktop-development
9995
- name: Building C/C++ Projects
10096
tocHref: /cpp/build/
101-
tocHref: /cpp/build/building-c-cpp-programs
97+
topicHref: /cpp/build/building-c-cpp-programs
10298
items:
10399
- name: Build Reference
104100
tocHref: /cpp/build/reference/

docs/assembler/arm/TOC.md

Lines changed: 0 additions & 4 deletions
This file was deleted.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ The Microsoft ARM assembler (*armasm*) emits diagnostic warnings and errors when
1717

1818
> A2193: this instruction generates unpredictable behavior
1919
20-
The ARM architecture cannot guarantee what happens when this instruction is executed. For details about the well-defined forms of this instruction, consult the [ARM Architecture Reference Manual](http://go.microsoft.com/fwlink/p/?linkid=246464).
20+
The ARM architecture cannot guarantee what happens when this instruction is executed. For details about the well-defined forms of this instruction, consult the [ARM Architecture Reference Manual](https://go.microsoft.com/fwlink/p/?linkid=246464).
2121

2222
```asm
2323
ADD r0, r8, pc ; A2193: this instruction generates unpredictable behavior
@@ -93,7 +93,7 @@ In ARM mode, there is an alternate syntax for specifying constants. Instead of
9393

9494
> A4509: This form of conditional instruction is deprecated
9595
96-
This form of conditional instruction has been deprecated by ARM in the ARMv8 architecture. We recommend that you change the code to use conditional branches. To see which conditional instructions are still supported, consult the [ARM Architecture Reference Manual](http://go.microsoft.com/fwlink/p/?linkid=246464).
96+
This form of conditional instruction has been deprecated by ARM in the ARMv8 architecture. We recommend that you change the code to use conditional branches. To see which conditional instructions are still supported, consult the [ARM Architecture Reference Manual](https://go.microsoft.com/fwlink/p/?linkid=246464).
9797

9898
This warning is not emitted when the **-oldit** command-line switch is used.
9999

docs/assembler/inline/TOC.md

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)