Skip to content

Commit 30e2c0a

Browse files
committed
Merge branch 'main' into doc-fixes
2 parents f2e3b3e + 013d80b commit 30e2c0a

File tree

21,647 files changed

+400568
-366140
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,647 files changed

+400568
-366140
lines changed

.openpublishing.publish.config.json

Lines changed: 70 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,12 @@
6868
"branch": "master",
6969
"branch_mapping": {}
7070
},
71+
{
72+
"path_to_root": "ms-identity-docs-code-javascript",
73+
"url": "https://github.com/Azure-Samples/ms-identity-docs-code-javascript",
74+
"branch": "main",
75+
"branch_mapping": {}
76+
},
7177
{
7278
"path_to_root": "_themes",
7379
"url": "https://github.com/Microsoft/templates.docs.msft",
@@ -233,7 +239,13 @@
233239
{
234240
"path_to_root": "azure-functions-durable-js",
235241
"url": "https://github.com/Azure/azure-functions-durable-js",
236-
"branch": "main",
242+
"branch": "v2.x",
243+
"branch_mapping": {}
244+
},
245+
{
246+
"path_to_root": "azure-functions-durable-js-v3",
247+
"url": "https://github.com/Azure/azure-functions-durable-js",
248+
"branch": "v3.x",
237249
"branch_mapping": {}
238250
},
239251
{
@@ -368,6 +380,12 @@
368380
"branch": "master",
369381
"branch_mapping": {}
370382
},
383+
{
384+
"path_to_root": "ms-identity-docs-code-dotnet",
385+
"url": "https://github.com/Azure-Samples/ms-identity-docs-code-dotnet",
386+
"branch": "main",
387+
"branch_mapping": {}
388+
},
371389
{
372390
"path_to_root": "remote-monitoring-webui",
373391
"url": "https://github.com/Azure/pcs-remote-monitoring-webui.git",
@@ -536,6 +554,12 @@
536554
"branch": "main",
537555
"branch_mapping": {}
538556
},
557+
{
558+
"path_to_root": "azure-cosmos-db-mongodb-mern-web-app",
559+
"url": "https://github.com/Azure-samples/msdocs-azure-cosmos-db-mongodb-mern-web-app/",
560+
"branch": "main",
561+
"branch_mapping": {}
562+
},
539563
{
540564
"path_to_root": "azure-cosmos-spark",
541565
"url": "https://github.com/Azure/azure-cosmosdb-spark",
@@ -686,6 +710,12 @@
686710
"branch": "master",
687711
"branch_mapping": {}
688712
},
713+
{
714+
"path_to_root": "ms-identity-javascript-react-docs",
715+
"url": "https://github.com/Azure-Samples/ms-identity-javascript-react-docs",
716+
"branch": "main",
717+
"branch_mapping": {}
718+
},
689719
{
690720
"path_to_root": "cognitive-services-quickstart-code",
691721
"url": "https://github.com/Azure-Samples/cognitive-services-quickstart-code",
@@ -760,7 +790,7 @@
760790
},
761791
{
762792
"path_to_root": "azure-spring-apps-reference-architecture",
763-
"url": "https://github.com/Azure/azure-spring-apps-reference-architecture",
793+
"url": "https://github.com/Azure/azure-spring-apps-landing-zone-accelerator",
764794
"branch": "reference-architecture",
765795
"branch_mapping": {}
766796
},
@@ -866,6 +896,18 @@
866896
"branch": "docs-snippets",
867897
"branch_mapping": {}
868898
},
899+
{
900+
"path_to_root": "ms-identity-python-webapp",
901+
"url": "https://github.com/Azure-Samples/ms-identity-python-webapp",
902+
"branch": "main",
903+
"branch_mapping": {}
904+
},
905+
{
906+
"path_to_root": "ms-identity-python-webapp-tutorial",
907+
"url": "https://github.com/Azure-Samples/ms-identity-python-webapp",
908+
"branch": "0.5.0",
909+
"branch_mapping": {}
910+
},
869911
{
870912
"path_to_root": "ms-identity-node",
871913
"url": "https://github.com/Azure-Samples/ms-identity-node",
@@ -913,6 +955,24 @@
913955
"url": "https://github.com/Azure-Samples/azure-cosmos-db-mongodb-python-getting-started",
914956
"branch": "main",
915957
"branch_mapping": {}
958+
},
959+
{
960+
"path_to_root": "azure-ai-vision-sdk",
961+
"url": "https://github.com/Azure-Samples/azure-ai-vision-sdk",
962+
"branch": "main",
963+
"branch_mapping": {}
964+
},
965+
{
966+
"path_to_root": "azure-cache-redis-samples",
967+
"url": "https://github.com/Azure-Samples/azure-cache-redis-samples",
968+
"branch": "main",
969+
"branch_mapping": {}
970+
},
971+
{
972+
"path_to_root": "microsoft-graph",
973+
"url": "https://github.com/MicrosoftGraph/microsoft-graph-docs",
974+
"branch": "main",
975+
"branch_mapping": {}
916976
}
917977
],
918978
"branch_target_mapping": {
@@ -934,9 +994,11 @@
934994
".openpublishing.redirection.app-service.json",
935995
".openpublishing.redirection.azure-arc-data.json",
936996
".openpublishing.redirection.azure-attestation.json",
997+
".openpublishing.redirection.azure-app-configuration.json",
937998
".openpublishing.redirection.azure-australia.json",
938999
".openpublishing.redirection.azure-databricks.json",
9391000
".openpublishing.redirection.azure-hpc.json",
1001+
".openpublishing.redirection.azure-kubernetes-service.json",
9401002
".openpublishing.redirection.azure-monitor.json",
9411003
".openpublishing.redirection.azure-percept.json",
9421004
".openpublishing.redirection.azure-productivity.json",
@@ -947,8 +1009,6 @@
9471009
".openpublishing.redirection.baremetal-infrastructure.json",
9481010
".openpublishing.redirection.defender-for-cloud.json",
9491011
".openpublishing.redirection.defender-for-iot.json",
950-
".openpublishing.redirection.deployment-environments.json",
951-
".openpublishing.redirection.dev-box.json",
9521012
".openpublishing.redirection.healthcare-apis.json",
9531013
".openpublishing.redirection.iot-hub-device-update.json",
9541014
".openpublishing.redirection.json",
@@ -958,6 +1018,7 @@
9581018
".openpublishing.redirection.security-benchmark.json",
9591019
".openpublishing.redirection.sql-database.json",
9601020
".openpublishing.redirection.virtual-desktop.json",
1021+
".openpublishing.redirection.devops-project.json",
9611022
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-old.json",
9621023
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-services.json",
9631024
"articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
@@ -984,9 +1045,10 @@
9841045
"articles/iot-develop/.openpublishing.redirection.iot-develop.json",
9851046
"articles/iot-dps/.openpublishing.redirection.iot-dps.json",
9861047
"articles/iot-edge/.openpublishing.redirection.iot-edge.json",
987-
"articles/iot-fundamentals/.openpublishing.redirection.iot-fundamentals.json",
1048+
"articles/iot/.openpublishing.redirection.iot.json",
9881049
"articles/iot-hub/.openpublishing.redirection.iot-hub.json",
9891050
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
1051+
"articles/logic-apps/.openpublishing.redirection.logic-apps.json",
9901052
"articles/machine-learning/.openpublishing.redirection.machine-learning.json",
9911053
"articles/mariadb/.openpublishing.redirection.mariadb.json",
9921054
"articles/marketplace/.openpublishing.redirection.marketplace.json",
@@ -1003,6 +1065,8 @@
10031065
"articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
10041066
"articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
10051067
"articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
1006-
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json"
1068+
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
1069+
"articles/dev-box/.openpublishing.redirection.dev-box.json",
1070+
"articles/deployment-environments/.openpublishing.redirection.deployment-environments.json"
10071071
]
10081072
}

0 commit comments

Comments
 (0)