Skip to content

Commit dabcd48

Browse files
authored
Merge branch 'MicrosoftDocs:main' into master
2 parents 1c3e48e + a68d606 commit dabcd48

File tree

21,413 files changed

+194880
-831398
lines changed

Some content is hidden

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

21,413 files changed

+194880
-831398
lines changed

.docutune/config/docutune-azure-docs-pr.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,14 @@
1616
"articles/governance/",
1717
"includes/policy/",
1818
"includes/defender-for-cloud-alerts-schema-log-analytics-workspace.md",
19-
"third-party-notices.md",
2019
"*whats-new*",
20+
"*releasenotes*",
2121
"*release-notes*",
2222
"*third-party-notices*",
23-
"*change-log*",
2423
"*changelog*",
24+
"*change-log*",
2525
"*reference-breaking-changes*",
26+
"*versionhistory*",
2627
"*version-history*",
2728
"banner.md"
2829
],

.openpublishing.publish.config.json

Lines changed: 66 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@
3232
"need_preview_pull_request": true,
3333
"contribution_branch_mappings": {},
3434
"dependent_repositories": [
35+
{
36+
"path_to_root": "azure-functions-dapr-extension",
37+
"url": "https://github.com/Azure/azure-functions-dapr-extension",
38+
"branch": "master",
39+
"branch_mapping": {}
40+
},
3541
{
3642
"path_to_root": "azure-docs-snippets-pr",
3743
"url": "https://github.com/MicrosoftDocs/azure-docs-snippets-pr",
@@ -68,6 +74,18 @@
6874
"branch": "master",
6975
"branch_mapping": {}
7076
},
77+
{
78+
"path_to_root": "ms-identity-docs-code-dotnet",
79+
"url": "https://github.com/Azure-Samples/ms-identity-docs-code-dotnet",
80+
"branch": "main",
81+
"branch_mapping": {}
82+
},
83+
{
84+
"path_to_root": "ms-identity-javascript-react-docs",
85+
"url": "https://github.com/Azure-Samples/ms-identity-javascript-react-docs",
86+
"branch": "main",
87+
"branch_mapping": {}
88+
},
7189
{
7290
"path_to_root": "ms-identity-docs-code-javascript",
7391
"url": "https://github.com/Azure-Samples/ms-identity-docs-code-javascript",
@@ -80,6 +98,48 @@
8098
"branch": "main",
8199
"branch_mapping": {}
82100
},
101+
{
102+
"path_to_root": "ms-identity-javascript-v2",
103+
"url": "https://github.com/Azure-Samples/ms-identity-javascript-v2",
104+
"branch": "master",
105+
"branch_mapping": {}
106+
},
107+
{
108+
"path_to_root": "ms-identity-python-webapp-quickstart",
109+
"url": "https://github.com/Azure-Samples/ms-identity-python-webapp",
110+
"branch": "0.7.0",
111+
"branch_mapping": {}
112+
},
113+
{
114+
"path_to_root": "ms-identity-python-webapp-tutorial",
115+
"url": "https://github.com/Azure-Samples/ms-identity-python-webapp",
116+
"branch": "0.6.0",
117+
"branch_mapping": {}
118+
},
119+
{
120+
"path_to_root": "ms-identity-node",
121+
"url": "https://github.com/Azure-Samples/ms-identity-node",
122+
"branch": "main",
123+
"branch_mapping": {}
124+
},
125+
{
126+
"path_to_root": "ms-identity-javascript-nodejs-desktop",
127+
"url": "https://github.com/Azure-Samples/ms-identity-javascript-nodejs-desktop",
128+
"branch": "main",
129+
"branch_mapping": {}
130+
},
131+
{
132+
"path_to_root": "ms-identity-b2c-javascript-spa",
133+
"url": "https://github.com/Azure-Samples/ms-identity-b2c-javascript-spa",
134+
"branch": "main",
135+
"branch_mapping": {}
136+
},
137+
{
138+
"path_to_root": "ms-identity-dotnetcore-b2c-account-management",
139+
"url": "https://github.com/Azure-Samples/ms-identity-dotnetcore-b2c-account-management",
140+
"branch": "master",
141+
"branch_mapping": {}
142+
},
83143
{
84144
"path_to_root": "_themes",
85145
"url": "https://github.com/Microsoft/templates.docs.msft",
@@ -398,12 +458,6 @@
398458
"branch": "master",
399459
"branch_mapping": {}
400460
},
401-
{
402-
"path_to_root": "ms-identity-docs-code-dotnet",
403-
"url": "https://github.com/Azure-Samples/ms-identity-docs-code-dotnet",
404-
"branch": "main",
405-
"branch_mapping": {}
406-
},
407461
{
408462
"path_to_root": "remote-monitoring-webui",
409463
"url": "https://github.com/Azure/pcs-remote-monitoring-webui.git",
@@ -434,12 +488,6 @@
434488
"branch": "v1-archive",
435489
"branch_mapping": {}
436490
},
437-
{
438-
"path_to_root": "azureml-examples-batch-pup",
439-
"url": "https://github.com/azure/azureml-examples",
440-
"branch": "santiagxf/batch-pup",
441-
"branch_mapping": {}
442-
},
443491
{
444492
"path_to_root": "azureml-examples-mavaisma-r-azureml",
445493
"url": "https://github.com/azure/azureml-examples",
@@ -453,21 +501,9 @@
453501
"branch_mapping": {}
454502
},
455503
{
456-
"path_to_root": "azureml-examples-sdk-preview",
457-
"url": "https://github.com/azure/azureml-examples",
458-
"branch": "sdk-preview",
459-
"branch_mapping": {}
460-
},
461-
{
462-
"path_to_root": "azureml-examples-online-endpoint-vnet",
463-
"url": "https://github.com/azure/azureml-examples",
464-
"branch": "main",
465-
"branch_mapping": {}
466-
},
467-
{
468-
"path_to_root": "azureml-examples-featurestore",
504+
"path_to_root": "azureml-examples-temp-fix",
469505
"url": "https://github.com/Azure/azureml-examples",
470-
"branch": "featurestore/pup",
506+
"branch": "temp-fix-doc-error",
471507
"branch_mapping": {}
472508
},
473509
{
@@ -752,12 +788,6 @@
752788
"branch": "master",
753789
"branch_mapping": {}
754790
},
755-
{
756-
"path_to_root": "ms-identity-javascript-react-docs",
757-
"url": "https://github.com/Azure-Samples/ms-identity-javascript-react-docs",
758-
"branch": "main",
759-
"branch_mapping": {}
760-
},
761791
{
762792
"path_to_root": "cognitive-services-quickstart-code",
763793
"url": "https://github.com/Azure-Samples/cognitive-services-quickstart-code",
@@ -872,24 +902,6 @@
872902
"branch": "master",
873903
"branch_mapping": {}
874904
},
875-
{
876-
"path_to_root": "ms-identity-b2c-javascript-spa",
877-
"url": "https://github.com/Azure-Samples/ms-identity-b2c-javascript-spa",
878-
"branch": "main",
879-
"branch_mapping": {}
880-
},
881-
{
882-
"path_to_root": "ms-identity-dotnetcore-b2c-account-management",
883-
"url": "https://github.com/Azure-Samples/ms-identity-dotnetcore-b2c-account-management",
884-
"branch": "master",
885-
"branch_mapping": {}
886-
},
887-
{
888-
"path_to_root": "ms-identity-javascript-v2",
889-
"url": "https://github.com/Azure-Samples/ms-identity-javascript-v2",
890-
"branch": "master",
891-
"branch_mapping": {}
892-
},
893905
{
894906
"path_to_root": "msdocs-python-flask-webapp-quickstart",
895907
"url": "https://github.com/Azure-Samples/msdocs-python-flask-webapp-quickstart",
@@ -945,32 +957,14 @@
945957
"branch_mapping": {}
946958
},
947959
{
948-
"path_to_root": "ms-identity-python-webapp-quickstart",
949-
"url": "https://github.com/Azure-Samples/ms-identity-python-webapp",
950-
"branch": "0.7.0",
951-
"branch_mapping": {}
952-
},
953-
{
954-
"path_to_root": "ms-identity-python-webapp-tutorial",
955-
"url": "https://github.com/Azure-Samples/ms-identity-python-webapp",
956-
"branch": "0.6.0",
957-
"branch_mapping": {}
958-
},
959-
{
960-
"path_to_root": "ms-identity-node",
961-
"url": "https://github.com/Azure-Samples/ms-identity-node",
962-
"branch": "main",
963-
"branch_mapping": {}
964-
},
965-
{
966-
"path_to_root": "ms-identity-javascript-nodejs-desktop",
967-
"url": "https://github.com/Azure-Samples/ms-identity-javascript-nodejs-desktop",
960+
"path_to_root": "cosmos-db-nosql-dotnet-samples",
961+
"url": "https://github.com/azure-samples/cosmos-db-nosql-dotnet-samples",
968962
"branch": "main",
969963
"branch_mapping": {}
970964
},
971965
{
972-
"path_to_root": "cosmos-db-nosql-dotnet-samples",
973-
"url": "https://github.com/azure-samples/cosmos-db-nosql-dotnet-samples",
966+
"path_to_root": "cosmos-db-nosql-dotnet-quickstart",
967+
"url": "https://github.com/azure-samples/cosmos-db-nosql-dotnet-quickstart",
974968
"branch": "main",
975969
"branch_mapping": {}
976970
},
@@ -1184,7 +1178,6 @@
11841178
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
11851179
"articles/azure-relay/.openpublishing.redirection.relay.json",
11861180
"articles/azure-video-analyzer/.openpublishing.redirection.azure-video-analyzer.json",
1187-
"articles/azure-video-indexer/.openpublishing.redirection.azure-video-indexer.json",
11881181
"articles/cloud-shell/.openpublishing.redirection.cloud-shell.json",
11891182
"articles/communication-services/.openpublishing.redirection.communication-services.json",
11901183
"articles/communications-gateway/.openpublishing.redirection.communications-gateway.json",

0 commit comments

Comments
 (0)