Skip to content

Commit ee98658

Browse files
TylerMSFTTylerMSFT
TylerMSFT
authored and
TylerMSFT
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/cpp-docs-pr into twhitney-github2746
2 parents b143bd3 + 4f5a5a8 commit ee98658

2,174 files changed

Lines changed: 79919 additions & 58541 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{:allowed-branchname-matches ["^master$" "^release..*"]
1+
{:allowed-branchname-matches ["main" "release-.*"]
22
:allowed-filename-matches ["docs" "styleguide"]
33

44
:template-header

‎.github/ISSUE_TEMPLATE/new-c---2020-stl-library-documentation-topic-.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
name: 'New C++ 2020 STL library documentation topic '
33
about: Create a C++ 2020 doc tracking work item
44
title: ''
5-
labels: STL doc work, C++20
5+
labels: C++20, STL doc work
66
assignees: ''
7-
milestone: backlog
8-
project: C++20
7+
98
---
109

1110
ISO paper for this feature: [PaperID]()

‎.github/ISSUE_TEMPLATE/new-c---2023-stl-library-documentation-topic.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
name: New C++ 2023 STL library documentation topic
3+
about: Create an issue to track C++ 2023 STL doc work
4+
title: ''
5+
labels: C++23
6+
assignees: ''
7+
8+
---
9+
10+
ISO paper for this feature: [PaperID](http link to iso paper)
11+
First implemented in: VS 20YY major.minor

‎.markdownlint.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"default": true,
33
"DOCSMD006": false,
44
"MD001": false,
5+
"MD004": false,
56
"MD013": false,
67
"MD024": {
78
"siblings_only": true

‎.openpublishing.publish.config.json‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@
1010
"moniker_ranges": [
1111
">= msvc-140"
1212
],
13-
"xref_query_tags": ["/dotnet", "/uwp/api"],
13+
"xref_query_tags": [
14+
"/dotnet",
15+
"/uwp/api"
16+
],
1417
"open_to_public_contributors": true,
1518
"type_mapping": {
1619
"Conceptual": "Content",
@@ -22,23 +25,25 @@
2225
}
2326
],
2427
"notification_subscribers": [],
28+
"sync_notification_subscribers": null,
2529
"branches_to_filter": [],
2630
"git_repository_url_open_to_public_contributors": "https://github.com/Microsoft/cpp-docs",
27-
"git_repository_branch_open_to_public_contributors": "master",
31+
"git_repository_branch_open_to_public_contributors": "main",
2832
"skip_source_output_uploading": false,
2933
"need_preview_pull_request": true,
3034
"enable_incremental_build": true,
35+
"contribution_branch_mappings": null,
3136
"dependent_repositories": [
3237
{
3338
"path_to_root": "_themes",
3439
"url": "https://github.com/Microsoft/templates.docs.msft",
35-
"branch": "master",
40+
"branch": "main",
3641
"branch_mapping": {}
3742
},
3843
{
3944
"path_to_root": "_themes.pdf",
4045
"url": "https://github.com/Microsoft/templates.docs.msft.pdf",
41-
"branch": "master",
46+
"branch": "main",
4247
"branch_mapping": {}
4348
}
4449
],
@@ -47,7 +52,7 @@
4752
"Publish",
4853
"Pdf"
4954
],
50-
"master": [
55+
"main": [
5156
"Publish",
5257
"Pdf"
5358
]

0 commit comments

Comments
 (0)