Skip to content

Commit d8e2103

Browse files
authored
Merge branch 'main' into azure-ad-b2c-go-local
2 parents 4eba6a3 + 6601000 commit d8e2103

File tree

9,012 files changed

+100903
-62368
lines changed

Some content is hidden

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

9,012 files changed

+100903
-62368
lines changed

.openpublishing.publish.config.json

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,12 @@
164164
"branch": "dev",
165165
"branch_mapping": {}
166166
},
167+
{
168+
"path_to_root": "functions-quickstart-templates-v1",
169+
"url": "https://github.com/Azure/azure-functions-templates",
170+
"branch": "v1.x",
171+
"branch_mapping": {}
172+
},
167173
{
168174
"path_to_root": "azure-functions-samples-java",
169175
"url": "https://github.com/Azure-Samples/azure-functions-samples-java",
@@ -212,6 +218,12 @@
212218
"branch": "main",
213219
"branch_mapping": {}
214220
},
221+
{
222+
"path_to_root": "azure-functions-durable-js",
223+
"url": "https://github.com/Azure/azure-functions-durable-js",
224+
"branch": "main",
225+
"branch_mapping": {}
226+
},
215227
{
216228
"path_to_root": "azure-functions-kafka-extension",
217229
"url": "https://github.com/Azure/azure-functions-kafka-extension",
@@ -849,9 +861,15 @@
849861
"branch_mapping": {}
850862
},
851863
{
852-
"path_to_root": "azure-cosmos-dotnet-v3",
853-
"url": "https://github.com/Azure-Samples/cosmos-db-sql-api-dotnet-samples",
854-
"branch": "v3",
864+
"path_to_root": "cosmos-db-nosql-dotnet-samples",
865+
"url": "https://github.com/azure-samples/cosmos-db-nosql-dotnet-samples",
866+
"branch": "main",
867+
"branch_mapping": {}
868+
},
869+
{
870+
"path_to_root": "cosmos-db-nosql-python-samples",
871+
"url": "https://github.com/azure-samples/cosmos-db-nosql-python-samples",
872+
"branch": "main",
855873
"branch_mapping": {}
856874
},
857875
{
@@ -871,6 +889,12 @@
871889
"url": "https://github.com/MicrosoftDocs/reusable-content",
872890
"branch": "main",
873891
"branch_mapping": {}
892+
},
893+
{
894+
"path_to_root": "azure-cosmos-db-mongodb-python-getting-started",
895+
"url": "https://github.com/Azure-Samples/azure-cosmos-db-mongodb-python-getting-started",
896+
"branch": "main",
897+
"branch_mapping": {}
874898
}
875899
],
876900
"branch_target_mapping": {
@@ -952,6 +976,7 @@
952976
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-old.json",
953977
"articles/cognitive-services/.openpublishing.redirection.cognitive-services.json",
954978
".openpublishing.redirection.baremetal-infrastructure.json",
955-
"articles/iot-dps/.openpublishing.redirection.iot-dps.json"
979+
"articles/iot-dps/.openpublishing.redirection.iot-dps.json",
980+
"articles/cloud-shell/.openpublishing.redirection.cloud-shell.json"
956981
]
957982
}

.openpublishing.redirection.active-directory.json

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,21 @@
4545
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
4646
"redirect_document_id": false
4747
},
48+
{
49+
"source_path_from_root": "/articles/active-directory/saas-apps/icertisicm-tutorial.md",
50+
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
51+
"redirect_document_id": false
52+
},
4853
{
4954
"source_path_from_root": "/articles/active-directory/governance/tutorial-onboard-custom-workflow-graph.md",
5055
"redirect_url": "/graph/tutorial-lifecycle-workflows-onboard-custom-workflow",
5156
"redirect_document_id": false
5257
},
58+
{
59+
"source_path_from_root": "/articles/active-directory/governance/lifecycle-workflows-developer-reference.md",
60+
"redirect_url": "/graph/api/resources/identitygovernance-workflow",
61+
"redirect_document_id": false
62+
},
5363
{
5464
"source_path_from_root": "/articles/active-directory/governance/tutorial-offboard-custom-workflow-graph.md",
5565
"redirect_url": "/graph/tutorial-lifecycle-workflows-offboard-custom-workflow",
@@ -112,7 +122,7 @@
112122
},
113123
{
114124
"source_path_from_root": "/articles/active-directory/develop/active-directory-v2-limitations.md",
115-
"redirect_url": "/azure/active-directory/azuread-dev/azure-ad-endpoint-comparison",
125+
"redirect_url": "/azure/active-directory/develop/v2-overview",
116126
"redirect_document_id": false
117127
},
118128
{
@@ -1897,7 +1907,7 @@
18971907
},
18981908
{
18991909
"source_path_from_root": "/articles/active-directory/develop/azure-ad-endpoint-comparison.md",
1900-
"redirect_url": "/azure/active-directory/azuread-dev/azure-ad-endpoint-comparison",
1910+
"redirect_url": "/azure/active-directory/develop/v2-overview",
19011911
"redirect_document_id": false
19021912
},
19031913
{
@@ -10948,7 +10958,7 @@
1094810958
},
1094910959
{
1095010960
"source_path_from_root": "/articles/active-directory/fundamentals/keep-me-signed-in.md",
10951-
"redirect_url": "/azure/active-directory/fundamentals/customize-branding",
10961+
"redirect_url": "/azure/active-directory/fundamentals/active-directory-users-profile-azure-portal",
1095210962
"redirect_document_id": false
1095310963
},
1095410964
{
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/high-performance-compute/index.yml",
5+
"redirect_url": "/articles/high-performance-computing",
6+
"redirect_document_id": false
7+
}
8+
]
9+
}

.openpublishing.redirection.azure-monitor.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5516,6 +5516,31 @@
55165516
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-prometheus-monitoring-addon.md",
55175517
"redirect_url": "/azure/azure-monitor/containers/container-insights-prometheus",
55185518
"redirect_document_id": false
5519+
},
5520+
{
5521+
"source_path_from_root": "/articles/azure-monitor/app/powershell-azure-diagnostics.md",
5522+
"redirect_url": "/azure/azure-monitor/agents/diagnostics-extension-to-application-insights",
5523+
"redirect_document_id": false
5524+
},
5525+
{
5526+
"source_path_from_root": "/articles/azure-monitor/app/platforms.md",
5527+
"redirect_url": "/azure/azure-monitor/app/app-insights-overview",
5528+
"redirect_document_id": false
5529+
},
5530+
{
5531+
"source_path_from_root": "/articles/azure-monitor/app/export-data-model.md",
5532+
"redirect_url": "/azure/azure-monitor/app/export-telemetry",
5533+
"redirect_document_id": false
5534+
},
5535+
{
5536+
"source_path_from_root": "/articles/azure-monitor/app/custom-endpoints.md",
5537+
"redirect_url": "/azure/azure-monitor/app/create-new-resource",
5538+
"redirect_document_id": false
5539+
},
5540+
{
5541+
"source_path_from_root": "/articles/azure-monitor/logs/api/authentication-authorization.md",
5542+
"redirect_url": "/azure/azure-monitor/logs/api/access-api",
5543+
"redirect_document_id": false
55195544
}
55205545
]
55215546
}

.openpublishing.redirection.azure-productivity.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@
2929
"source_path_from_root": "/articles/devtest-labs/scripts/set-allowed-vm-sizes-in-lab.md",
3030
"redirect_url": "/azure/devtest-labs/samples-powershell",
3131
"redirect_document_id": false
32-
}
32+
},
33+
{
34+
"source_path": "articles/dev-box/tutorial-connect-to-dev-box-with-remote-desktop-app.md",
35+
"redirect_url": "/azure/dev-box/quickstart-connect-to-dev-box-with-remote-desktop-app",
36+
"redirect_document_id": false
37+
}
3338
]
3439
}

.openpublishing.redirection.communication-services.json

Lines changed: 0 additions & 9 deletions
This file was deleted.

.openpublishing.redirection.defender-for-cloud.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,11 @@
754754
"source_path_from_root": "/articles/defender-for-cloud/defender-for-containers-va-acr.md",
755755
"redirect_url": "/azure/defender-for-cloud/defender-for-containers-vulnerability-assessment-azure",
756756
"redirect_document_id": true
757-
}
758-
757+
},
758+
{
759+
"source_path_from_root": "/articles/defender-for-cloud/deploy-vulnerability-assessment-tvm.md",
760+
"redirect_url": "/azure/defender-for-cloud/deploy-vulnerability-assessment-defender-vulnerability-management",
761+
"redirect_document_id": true
762+
}
759763
]
760764
}

.openpublishing.redirection.defender-for-iot.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,25 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-create-and-manage-users.md",
5+
"redirect_url": "/azure/defender-for-iot/organizations/manage-users-overview",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/defender-for-iot/organizations/integrate-with-active-directory.md",
10+
"redirect_url": "/azure/defender-for-iot/organizations/manage-users-sensor#integrate-ot-sensor-users-with-active-directory",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-define-global-user-access-control.md",
15+
"redirect_url": "/azure/defender-for-iot/organizations/manage-users-on-premises-management-console#define-global-access-permission-for-on-premises-users",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/articles/defender-for-iot/organizations/tutorial-getting-started-eiot-sensor.md",
20+
"redirect_url": "/azure/defender-for-iot/organizations/concept-enterprise",
21+
"redirect_document_id": false
22+
},
323
{
424
"source_path_from_root": "/articles/defender-for-iot/organizations/resources-frequently-asked-questions.md",
525
"redirect_url": "/azure/defender-for-iot/organizations/faqs-general",

0 commit comments

Comments
 (0)