Skip to content

Commit 0ddc812

Browse files
authored
Merge pull request MicrosoftDocs#1 from MicrosoftDocs/master
Syncing with master.
2 parents 625e651 + 28cd1ba commit 0ddc812

File tree

1,843 files changed

+17747
-11871
lines changed

Some content is hidden

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

1,843 files changed

+17747
-11871
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ _themes.VS.Modern/
1313

1414
# Documentation build
1515
/docs/vcppdocs
16+
debug.log

.openpublishing.publish.config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"locale": "en-us",
99
"monikers": [],
1010
"moniker_ranges": [
11-
">= vs-2015"
11+
">= msvc-140"
1212
],
1313
"xref_query_tags": ["/dotnet", "/uwp/api"],
1414
"open_to_public_contributors": true,

.openpublishing.redirection.json

Lines changed: 55 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -700,6 +700,41 @@
700700
"redirect_url": "/cpp/build-insights/reference/wpa-views",
701701
"redirect_document_id": false
702702
},
703+
{
704+
"source_path": "docs/c-language/operators-c.md",
705+
"redirect_url": "/cpp/c-language/lexical-grammar",
706+
"redirect_document_id": false
707+
},
708+
{
709+
"source_path": "docs/c-language/punctuators.md",
710+
"redirect_url": "/cpp/c-language/lexical-grammar",
711+
"redirect_document_id": false
712+
},
713+
{
714+
"source_path": "docs/c-language/summary-of-constants.md",
715+
"redirect_url": "/cpp/c-language/lexical-grammar",
716+
"redirect_document_id": false
717+
},
718+
{
719+
"source_path": "docs/c-language/summary-of-identifiers.md",
720+
"redirect_url": "/cpp/c-language/lexical-grammar",
721+
"redirect_document_id": false
722+
},
723+
{
724+
"source_path": "docs/c-language/summary-of-keywords.md",
725+
"redirect_url": "/cpp/c-language/lexical-grammar",
726+
"redirect_document_id": false
727+
},
728+
{
729+
"source_path": "docs/c-language/summary-of-string-literals.md",
730+
"redirect_url": "/cpp/c-language/lexical-grammar",
731+
"redirect_document_id": false
732+
},
733+
{
734+
"source_path": "docs/c-language/summary-of-tokens.md",
735+
"redirect_url": "/cpp/c-language/lexical-grammar",
736+
"redirect_document_id": false
737+
},
703738
{
704739
"source_path": "docs/cloud/index.md",
705740
"redirect_url": "/cpp/cloud/cloud-and-web-programming-in-visual-cpp",
@@ -8377,12 +8412,12 @@
83778412
},
83788413
{
83798414
"source_path": "docs/windows/editing-properties-for-an-activex-control.md",
8380-
"redirect_url": "/cpp/windows/viewing-and-adding-activex-controls-to-a-dialog-box",
8415+
"redirect_url": "/cpp/windows/adding-editing-or-deleting-controls",
83818416
"redirect_document_id": false
83828417
},
83838418
{
83848419
"source_path": "docs/windows/insert-activex-control-dialog-box.md",
8385-
"redirect_url": "/cpp/windows/viewing-and-adding-activex-controls-to-a-dialog-box",
8420+
"redirect_url": "/cpp/windows/adding-editing-or-deleting-controls",
83868421
"redirect_document_id": false
83878422
},
83888423
{
@@ -8607,42 +8642,42 @@
86078642
},
86088643
{
86098644
"source_path": "docs/windows/creating-a-new-toolbar-button.md",
8610-
"redirect_url": "/cpp/windows/creating-moving-and-editing-toolbar-buttons",
8645+
"redirect_url": "/cpp/windows/toolbar-editor",
86118646
"redirect_document_id": false
86128647
},
86138648
{
86148649
"source_path": "docs/windows/moving-a-toolbar-button.md",
8615-
"redirect_url": "/cpp/windows/creating-moving-and-editing-toolbar-buttons",
8650+
"redirect_url": "/cpp/windows/toolbar-editor",
86168651
"redirect_document_id": false
86178652
},
86188653
{
86198654
"source_path": "docs/windows/copying-buttons-from-a-toolbar.md",
8620-
"redirect_url": "/cpp/windows/creating-moving-and-editing-toolbar-buttons",
8655+
"redirect_url": "/cpp/windows/toolbar-editor",
86218656
"redirect_document_id": false
86228657
},
86238658
{
86248659
"source_path": "docs/windows/deleting-a-toolbar-button.md",
8625-
"redirect_url": "/cpp/windows/creating-moving-and-editing-toolbar-buttons",
8660+
"redirect_url": "/cpp/windows/toolbar-editor",
86268661
"redirect_document_id": false
86278662
},
86288663
{
86298664
"source_path": "docs/windows/inserting-a-space-between-buttons-on-a-toolbar.md",
8630-
"redirect_url": "/cpp/windows/creating-moving-and-editing-toolbar-buttons",
8665+
"redirect_url": "/cpp/windows/toolbar-editor",
86318666
"redirect_document_id": false
86328667
},
86338668
{
86348669
"source_path": "docs/windows/removing-space-between-buttons-on-a-toolbar.md",
8635-
"redirect_url": "/cpp/windows/creating-moving-and-editing-toolbar-buttons",
8670+
"redirect_url": "/cpp/windows/toolbar-editor",
86368671
"redirect_document_id": false
86378672
},
86388673
{
86398674
"source_path": "docs/windows/changing-the-properties-of-a-toolbar-button.md",
8640-
"redirect_url": "/cpp/windows/creating-moving-and-editing-toolbar-buttons",
8675+
"redirect_url": "/cpp/windows/toolbar-editor",
86418676
"redirect_document_id": false
86428677
},
86438678
{
86448679
"source_path": "docs/windows/toolbar-button-properties.md",
8645-
"redirect_url": "/cpp/windows/creating-moving-and-editing-toolbar-buttons",
8680+
"redirect_url": "/cpp/windows/toolbar-editor",
86468681
"redirect_document_id": false
86478682
},
86488683
{
@@ -13419,6 +13454,16 @@
1341913454
"source_path": "docs/parallel/openmp/a-31-thread-safe-lock-functions.md",
1342013455
"redirect_url": "/cpp/parallel/openmp/a-examples#a31-thread-safe-lock-functions",
1342113456
"redirect_document_id": false
13457+
},
13458+
{
13459+
"source_path": "docs/c-runtime-library/operator-delete-crt.md",
13460+
"redirect_url": "docs/c-runtime-library/delete-operator-crt",
13461+
"redirect_document_id": false
13462+
},
13463+
{
13464+
"source_path": "docs/c-runtime-library/operator-new-crt.md",
13465+
"redirect_url": "docs/c-runtime-library/new-operator-crt",
13466+
"redirect_document_id": false
1342213467
}
1342313468
]
1342413469
}

docs/_breadcrumb/toc.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,9 @@
8989
- name: Linux
9090
tocHref: /cpp/linux/
9191
topicHref: /cpp/linux/index
92+
- name: Linux
93+
tocHref: /cpp/build/configure-cmake-debugging-sessions
94+
topicHref: /cpp/linux/index
9295
- name: MFC
9396
tocHref: /cpp/mfc/
9497
topicHref: /cpp/mfc/mfc-desktop-applications

0 commit comments

Comments
 (0)