Skip to content

Commit b04e575

Browse files
author
Michael Blome
committed
local merge conflicts
2 parents d878daa + cbc41e4 commit b04e575

10,931 files changed

Lines changed: 235883 additions & 277660 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.

.openpublishing.redirection.json

Lines changed: 62 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,16 @@
3030
"redirect_url": "/cpp/atl/reference/atl-classes",
3131
"redirect_document_id": false
3232
},
33+
{
34+
"source_path": "docs/atl/reference/atl-archetypes.md",
35+
"redirect_url": "/cpp/atl/reference/worker-archetype",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path": "docs/atl/reference/atl-structures.md",
40+
"redirect_url": "/cpp/atl/reference/atl-classes",
41+
"redirect_document_id": false
42+
},
3343
{
3444
"source_path": "docs/atl/reference/patlmodule.md",
3545
"redirect_url": "/cpp/atl/reference/atl-global-variables",
@@ -100,6 +110,11 @@
100110
"redirect_url": "/cpp/mfc/mfc-library-versions#mfc-static-library-naming-conventions",
101111
"redirect_document_id": false
102112
},
113+
{
114+
"source_path": "docs/build/search-path-used-by-windows-to-locate-a-dll.md",
115+
"redirect_url": "/cpp/build/dlls-in-visual-cpp",
116+
"redirect_document_id": false
117+
},
103118
{
104119
"source_path": "docs/build/reference/consistency-rules-for-per-file-use-of-precompiled-headers.md",
105120
"redirect_url": "/cpp/build/reference/creating-precompiled-header-files#consistency-rules-for-per-file-use-of-precompiled-headers",
@@ -232,7 +247,17 @@
232247
},
233248
{
234249
"source_path": "docs/cppcx/index.md",
235-
"redirect_url": "/cppcx/visual-c-language-reference-c-cx",
250+
"redirect_url": "/cpp/cppcx/visual-c-language-reference-c-cx",
251+
"redirect_document_id": false
252+
},
253+
{
254+
"source_path": "docs/cppcx/operator-subtracttype-hat.md",
255+
"redirect_url": "/cpp/cppcx/operator-type-hat",
256+
"redirect_document_id": false
257+
},
258+
{
259+
"source_path": "docs/cppcx/operator-subtractwindows-ui-xaml-interop-typename.md",
260+
"redirect_url": "/cpp/cppcx/operator-windows-ui-xaml-interop-typename",
236261
"redirect_document_id": false
237262
},
238263
{
@@ -280,6 +305,11 @@
280305
"redirect_url": "/cpp/c-runtime-library/reference/itoa-s-itow-s",
281306
"redirect_document_id": false
282307
},
308+
{
309+
"source_path": "docs/c-runtime-library/reference/ldiv-lldiv.md",
310+
"redirect_url": "/cpp/c-runtime-library/reference/div",
311+
"redirect_document_id": false
312+
},
283313
{
284314
"source_path": "docs/c-runtime-library/reference/ltoa.md",
285315
"redirect_url": "/cpp/c-runtime-library/reference/itoa-itow",
@@ -295,6 +325,21 @@
295325
"redirect_url": "/cpp/c-runtime-library/reference/itoa-s-itow-s",
296326
"redirect_document_id": false
297327
},
328+
{
329+
"source_path": "docs/c-runtime-library/reference/cos-cosf-cosl-cosh-coshf-coshl.md",
330+
"redirect_url": "/cpp/c-runtime-library/reference/cos-cosf-cosl.md",
331+
"redirect_document_id": false
332+
},
333+
{
334+
"source_path": "docs/c-runtime-library/reference/sin-sinf-sinl-sinh-sinhf-sinhl.md",
335+
"redirect_url": "/cpp/c-runtime-library/reference/sin-sinf-sinl.md",
336+
"redirect_document_id": false
337+
},
338+
{
339+
"source_path": "docs/c-runtime-library/reference/tan-tanf-tanl-tanh-tanhf-tanhl.md",
340+
"redirect_url": "/cpp/c-runtime-library/reference/tan-tanf-tanl.md",
341+
"redirect_document_id": false
342+
},
298343
{
299344
"source_path": "docs/c-runtime-library/reference/ultoa.md",
300345
"redirect_url": "/cpp/c-runtime-library/reference/itoa-itow",
@@ -380,6 +425,11 @@
380425
"redirect_url": "/cpp/mfc/mfc-library-versions#mfc-static-library-naming-conventions",
381426
"redirect_document_id": false
382427
},
428+
{
429+
"source_path": "docs/mfc/reference/button-styles.md",
430+
"redirect_url": "/cpp/mfc/reference/styles-used-by-mfc#button-styles",
431+
"redirect_document_id": false
432+
},
383433
{
384434
"source_path": "docs/mfc/reference/callback-function-for-cdc-enumobjects.md",
385435
"redirect_url": "/cpp/mfc/reference/callback-functions-used-by-mfc#enum_objects",
@@ -390,6 +440,11 @@
390440
"redirect_url": "/cpp/mfc/reference/callback-functions-used-by-mfc#graystring",
391441
"redirect_document_id": false
392442
},
443+
{
444+
"source_path": "docs/mfc/reference/combo-box-styles.md",
445+
"redirect_url": "/cpp/mfc/reference/styles-used-by-mfc#combo-box-styles",
446+
"redirect_document_id": false
447+
},
393448
{
394449
"source_path": "docs/mfc/reference/callback-function-for-cdc-setabortproc.md",
395450
"redirect_url": "/cpp/mfc/reference/callback-functions-used-by-mfc#setabortproc",
@@ -415,6 +470,11 @@
415470
"redirect_url": "/cpp/mfc/reference/mfc-classes",
416471
"redirect_document_id": false
417472
},
473+
{
474+
"source_path": "docs/mfc/reference/list-box-styles.md",
475+
"redirect_url": "/cpp/mfc/reference/styles-used-by-mfc#list-box-styles",
476+
"redirect_document_id": false
477+
},
418478
{
419479
"source_path": "docs/mfc/reference/message-box-styles.md",
420480
"redirect_url": "/cpp/mfc/reference/styles-used-by-mfc#message-box-styles",
@@ -586,4 +646,4 @@
586646
"redirect_document_id": false
587647
}
588648
]
589-
}
649+
}

CONTRIBUTING.md

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ In this topic, we'll cover:
1515
## Process for contributing
1616

1717
**Step 1:** Open an issue describing the article you wish to write and how it relates to existing content.
18-
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.
18+
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.
1919

2020
You can skip this first step for small changes.
2121

@@ -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 at 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/en-us/cpp/).
5656

5757
## DOs and DON'Ts
5858

@@ -66,7 +66,7 @@ Below is a short list of guiding rules that you should keep in mind when you are
6666
- **DO** blog and tweet (or whatever) about your contributions, frequently!
6767

6868
> [!NOTE]
69-
> 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.
69+
> 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.
7070
7171
## Building the docs
7272

@@ -82,14 +82,18 @@ If you are comfortable with other ways listed on the link above, feel free to us
8282

8383
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:
8484

85-
```
86-
docfx -t default --serve
87-
```
85+
`docfx -t default --serve`
8886

89-
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.
87+
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`.
9088

91-
**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.
89+
**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.
9290

93-
# Contributing to samples
91+
## Contributing to samples
9492

9593
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.
94+
95+
## Contributor license agreement
96+
97+
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 Wikipedia.
98+
99+
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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
# [Security Best Practices for C++](security/security-best-practices-for-cpp.md)
2727
## [Running as a Member of the Users Group](security/running-as-a-member-of-the-users-group.md)
2828
## [How User Account Control (UAC) Affects Your Application](security/how-user-account-control-uac-affects-your-application.md)
29+
## [C++ Developer Guidance for Speculative Execution Side Channels](security/developer-guidance-speculative-execution.md)
2930
# [Visual C++ Samples](visual-cpp-samples.md)
3031
# [Visual C++ Help and Community](visual-cpp-help-and-community.md)
3132
# [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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,12 @@
22
title: "ARM Assembler Command-Line Reference | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "11/04/2016"
5-
ms.reviewer: ""
6-
ms.suite: ""
7-
ms.technology: ["cpp-tools"]
8-
ms.tgt_pltfrm: ""
5+
ms.technology: ["cpp-masm"]
96
ms.topic: "reference"
107
dev_langs: ["C++"]
118
ms.assetid: f7b89478-1ab5-4995-8cde-a805f0462c45
12-
caps.latest.revision: 12
139
author: "corob-msft"
1410
ms.author: "corob"
15-
manager: "ghogen"
1611
ms.workload: ["cplusplus"]
1712
---
1813
# ARM Assembler Command-Line Reference

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,12 @@
22
title: "ARM Assembler Diagnostic Messages | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "11/04/2016"
5-
ms.reviewer: ""
6-
ms.suite: ""
7-
ms.technology: ["cpp-tools"]
8-
ms.tgt_pltfrm: ""
5+
ms.technology: ["cpp-masm"]
96
ms.topic: "reference"
107
dev_langs: ["C++"]
118
ms.assetid: 52b38267-6023-4bdc-a0ef-863362f48eec
12-
caps.latest.revision: 6
139
author: "corob-msft"
1410
ms.author: "corob"
15-
manager: "ghogen"
1611
ms.workload: ["cplusplus"]
1712
---
1813
# ARM Assembler Diagnostic Messages

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,12 @@
22
title: "ARM Assembler Directives | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "11/04/2016"
5-
ms.reviewer: ""
6-
ms.suite: ""
7-
ms.technology: ["cpp-tools"]
8-
ms.tgt_pltfrm: ""
5+
ms.technology: ["cpp-masm"]
96
ms.topic: "reference"
107
dev_langs: ["C++"]
118
ms.assetid: 9cfa8896-ec10-4e77-855a-3135c40d7d2a
12-
caps.latest.revision: 5
139
author: "corob-msft"
1410
ms.author: "corob"
15-
manager: "ghogen"
1611
ms.workload: ["cplusplus"]
1712
---
1813
# ARM Assembler Directives

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,12 @@
22
title: "ARM Assembler Reference | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "08/28/2017"
5-
ms.reviewer: ""
6-
ms.suite: ""
7-
ms.technology: ["cpp-tools"]
8-
ms.tgt_pltfrm: ""
5+
ms.technology: ["cpp-masm"]
96
ms.topic: "reference"
107
dev_langs: ["C++"]
118
ms.assetid: f8a076cc-9627-4328-a34a-9c44f7a3aab1
12-
caps.latest.revision: 13
139
author: "corob-msft"
1410
ms.author: "corob"
15-
manager: "ghogen"
1611
ms.workload: ["cplusplus"]
1712
---
1813
# ARM Assembler Reference

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,13 @@
22
title: "Accessing C or C++ Data in __asm Blocks | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "11/04/2016"
5-
ms.reviewer: ""
6-
ms.suite: ""
7-
ms.technology: ["cpp-tools"]
8-
ms.tgt_pltfrm: ""
9-
ms.topic: "article"
5+
ms.technology: ["cpp-masm"]
6+
ms.topic: "conceptual"
107
dev_langs: ["C++"]
118
helpviewer_keywords: ["data members [C++], in __asm blocks", "data access [C++], in __asm blocks", "__asm keyword [C++], data members", "structure types in __asm blocks"]
129
ms.assetid: e99f5a28-0381-4090-8ece-6af8f2436a49
13-
caps.latest.revision: 7
1410
author: "corob-msft"
1511
ms.author: "corob"
16-
manager: "ghogen"
1712
ms.workload: ["cplusplus"]
1813
---
1914
# Accessing C or C++ Data in __asm Blocks

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,13 @@
22
title: "Advantages of Inline Assembly | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "11/04/2016"
5-
ms.reviewer: ""
6-
ms.suite: ""
7-
ms.technology: ["cpp-tools"]
8-
ms.tgt_pltfrm: ""
9-
ms.topic: "article"
5+
ms.technology: ["cpp-masm"]
6+
ms.topic: "conceptual"
107
dev_langs: ["C++"]
118
helpviewer_keywords: ["assembler [C++], advantages", "inline assembly [C++], about inline assembly", "inline assembly [C++], using"]
129
ms.assetid: 94364d97-faa7-4bdf-8473-570956986c51
13-
caps.latest.revision: 7
1410
author: "corob-msft"
1511
ms.author: "corob"
16-
manager: "ghogen"
1712
ms.workload: ["cplusplus"]
1813
---
1914
# Advantages of Inline Assembly

docs/assembler/inline/asm.md

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,14 @@
22
title: "__asm | Microsoft Docs"
33
ms.custom: ""
44
ms.date: "11/04/2016"
5-
ms.reviewer: ""
6-
ms.suite: ""
7-
ms.technology: ["cpp-tools"]
8-
ms.tgt_pltfrm: ""
9-
ms.topic: "article"
5+
ms.technology: ["cpp-masm"]
6+
ms.topic: "conceptual"
107
f1_keywords: ["__asm", "__asm_cpp"]
118
dev_langs: ["C++"]
129
helpviewer_keywords: ["__asm keyword [C++], vs. asm blocks", "__asm keyword [C++]"]
1310
ms.assetid: 77ff3bc9-a492-4b5e-85e1-fa4e414e79cd
14-
caps.latest.revision: 14
1511
author: "corob-msft"
1612
ms.author: "corob"
17-
manager: "ghogen"
1813
ms.workload: ["cplusplus"]
1914
---
2015
# __asm

0 commit comments

Comments
 (0)