Skip to content

Commit 83b770e

Browse files
TylerMSFTTylerMSFT
TylerMSFT
authored and
TylerMSFT
committed
fix merge conflicts
2 parents 3a59991 + dcb855a commit 83b770e

1,716 files changed

Lines changed: 36972 additions & 27476 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.

‎CONTRIBUTING.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ In this topic, we'll cover:
88

99
- [Process for contributing](#process-for-contributing)
1010
- [DOs and DON'Ts](#dos-and-donts)
11-
- [Building the docs](#building-the-docs)
11+
- [Building the documentation](#building-the-documentation)
1212
- [Contributing to samples](#contributing-to-samples)
1313
- [Contributor license agreement](#contributor-license-agreement)
1414

@@ -70,11 +70,11 @@ Below is a short list of guiding rules that you should keep in mind when you are
7070
> [!NOTE]
7171
> 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.
7272
73-
## Building the docs
73+
## Building the documentation
7474

7575
The documentation is written in [GitHub-Flavored Markdown](https://help.github.com/categories/writing-on-github/) and built using [DocFX](https://dotnet.github.io/docfx/) and other internal publishing and build tools. It's published to [Microsoft Learn](https://learn.microsoft.com/).
7676

77-
If you want to build the docs locally, you need to install [DocFX](https://dotnet.github.io/docfx/); latest versions are the best.
77+
If you want to build the documentation locally, you need to install the latest version of [DocFX](https://dotnet.github.io/docfx/).
7878

7979
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.
8080

@@ -94,6 +94,6 @@ For now, include required sample code as inline code blocks in your article. The
9494

9595
## Contributor license agreement
9696

97-
You must sign the [Contribution License Agreement (CLA)](LICENSE) before your PR is merged. This is a one-time requirement for projects on Microsoft Docs. You can read more about [Contribution License Agreements (CLA)](https://en.wikipedia.org/wiki/Contributor_License_Agreement) on Wikipedia.
97+
You must sign the [Contribution License Agreement (CLA)](LICENSE) before your PR is merged. This is a one-time requirement for projects on Microsoft Learn. You can read more about [Contribution License Agreements (CLA)](https://en.wikipedia.org/wiki/Contributor_License_Agreement) on Wikipedia.
9898

9999
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.

‎SECURITY.md‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<!-- BEGIN MICROSOFT SECURITY.MD V0.0.8 BLOCK -->
2+
3+
## Security
4+
5+
Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/).
6+
7+
If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://aka.ms/opensource/security/definition), please report it to us as described below.
8+
9+
## Reporting Security Issues
10+
11+
**Please do not report security vulnerabilities through public GitHub issues.**
12+
13+
Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/opensource/security/create-report).
14+
15+
If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com). If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/opensource/security/pgpkey).
16+
17+
You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://aka.ms/opensource/security/msrc).
18+
19+
Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
20+
21+
* Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
22+
* Full paths of source file(s) related to the manifestation of the issue
23+
* The location of the affected source code (tag/branch/commit or direct URL)
24+
* Any special configuration required to reproduce the issue
25+
* Step-by-step instructions to reproduce the issue
26+
* Proof-of-concept or exploit code (if possible)
27+
* Impact of the issue, including how an attacker might exploit the issue
28+
29+
This information will help us triage your report more quickly.
30+
31+
If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/opensource/security/bounty) page for more details about our active programs.
32+
33+
## Preferred Languages
34+
35+
We prefer all communications to be in English.
36+
37+
## Policy
38+
39+
Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://aka.ms/opensource/security/cvd).
40+
41+
<!-- END MICROSOFT SECURITY.MD BLOCK -->

‎docs/assembler/masm/dot-xmm.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.assetid: db3062b6-8b2f-469b-aa02-df6571eab3ba
88
---
99
# .XMM (32-bit MASM)
1010

11-
Enables assembly of Internet Streaming SIMD Extension instructions. (32-bit MASM only.)
11+
Enables assembly of Streaming SIMD Extension instructions. (32-bit MASM only.)
1212

1313
## Syntax
1414

‎docs/atl-mfc-shared/allocating-and-releasing-memory-for-a-bstr.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ In general, the rules for allocating and releasing memory allocated for `BSTR`s
1515
- When you call into a function that expects a `BSTR` argument, you must allocate the memory for the `BSTR` before the call and release it afterwards. For example:
1616

1717
[!code-cpp[NVC_ATLMFC_Utilities#192](../atl-mfc-shared/codesnippet/cpp/allocating-and-releasing-memory-for-a-bstr_1.cpp)]
18-
18+
&nbsp;
1919
[!code-cpp[NVC_ATLMFC_Utilities#193](../atl-mfc-shared/codesnippet/cpp/allocating-and-releasing-memory-for-a-bstr_2.cpp)]
2020

2121
- When you call into a function that returns a `BSTR`, you must free the string yourself. For example:
2222

2323
[!code-cpp[NVC_ATLMFC_Utilities#194](../atl-mfc-shared/codesnippet/cpp/allocating-and-releasing-memory-for-a-bstr_3.cpp)]
24-
24+
&nbsp;
2525
[!code-cpp[NVC_ATLMFC_Utilities#195](../atl-mfc-shared/codesnippet/cpp/allocating-and-releasing-memory-for-a-bstr_4.cpp)]
2626

2727
- When you implement a function that returns a `BSTR`, allocate the string but do not free it. The receiving function releases the memory. For example:

‎docs/atl-mfc-shared/codesnippet/CPP/cstringt-class_2.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// OEM character 252 on most IBM-compatible computers in
2-
// Western countries/regions is superscript n, as in 2^n.
2+
// many countries/regions is superscript n, as in 2^n.
33
// Converting it to the ANSI English charset results in a
44
// normal character 'n', which is the closest possible
55
// representation.
@@ -14,4 +14,4 @@
1414
// the character's value truly was.
1515
str.AnsiToOem();
1616
ASSERT(str[0] != 252);
17-
ASSERT(str[0] == 'n');
17+
ASSERT(str[0] == 'n');

‎docs/atl-mfc-shared/cstring-argument-passing.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ If the string contents are to be changed by a function, declare the parameter as
2525
Typically you can return `CString` objects from functions because `CString` objects follow value semantics like primitive types. To return a read-only string, use a constant `CString` reference (`const CString&`). The following example illustrates the use of `CString` parameters and return types:
2626

2727
[!code-cpp[NVC_ATLMFC_Utilities#197](../atl-mfc-shared/codesnippet/cpp/cstring-argument-passing_1.cpp)]
28-
28+
&nbsp;
2929
[!code-cpp[NVC_ATLMFC_Utilities#198](../atl-mfc-shared/codesnippet/cpp/cstring-argument-passing_2.cpp)]
3030

3131
## See also

‎docs/atl-mfc-shared/reference/coledatetimespan-class.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ These operators compare two date/time-span values and return TRUE if the conditi
102102
### Example
103103

104104
[!code-cpp[NVC_ATLMFC_Utilities#25](../../atl-mfc-shared/codesnippet/cpp/coledatetimespan-class_1.cpp)]
105-
105+
&nbsp;
106106
[!code-cpp[NVC_ATLMFC_Utilities#26](../../atl-mfc-shared/codesnippet/cpp/coledatetimespan-class_2.cpp)]
107107

108108
## <a name="coledatetimespan"></a> COleDateTimeSpan::COleDateTimeSpan

‎docs/atl-mfc-shared/reference/cstringt-class.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,7 @@ Writes a formatted string and a variable list of arguments to a **`CStringT`** s
725725
### Example
726726

727727
[!code-cpp[NVC_ATLMFC_Utilities#119](../../atl-mfc-shared/codesnippet/cpp/cstringt-class_14.cpp)]
728-
728+
&nbsp;
729729
[!code-cpp[NVC_ATLMFC_Utilities#120](../../atl-mfc-shared/codesnippet/cpp/cstringt-class_15.cpp)]
730730

731731
## <a name="getenvironmentvariable"></a> `CStringT::GetEnvironmentVariable`

‎docs/atl/reference/ccomcontrolbase-class.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ One of the standard HRESULT values.
252252
### Example
253253

254254
[!code-cpp[NVC_ATL_COM#19](../../atl/codesnippet/cpp/ccomcontrolbase-class_2.cpp)]
255-
255+
&nbsp;
256256
[!code-cpp[NVC_ATL_COM#20](../../atl/codesnippet/cpp/ccomcontrolbase-class_3.h)]
257257

258258
## <a name="fireviewchange"></a> CComControlBase::FireViewChange

‎docs/atl/reference/ccomenum-class.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ The code shown below provides a reusable function for creating and initializing
7676

7777
[!code-cpp[NVC_ATL_COM#32](../../atl/codesnippet/cpp/ccomenum-class_1.h)]
7878

79-
This template function can be used to implement the `_NewEnum` property of a collection interface as shown below:
79+
This function template can be used to implement the `_NewEnum` property of a collection interface as shown below:
8080

8181
[!code-cpp[NVC_ATL_COM#33](../../atl/codesnippet/cpp/ccomenum-class_2.h)]
8282

0 commit comments

Comments
 (0)