Skip to content

Commit 8c9db0c

Browse files
authored
Merge branch 'MicrosoftDocs:main' into main
2 parents 7fdabcf + 6afac79 commit 8c9db0c

File tree

16,041 files changed

+299770
-165283
lines changed

Some content is hidden

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

16,041 files changed

+299770
-165283
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,6 @@ AzureMigration.ps1
2424
.gitignore
2525
**/.vscode/settings.json
2626
*.pdn
27+
28+
# Pycharm
29+
.idea/*

.openpublishing.publish.config.json

Lines changed: 47 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,12 @@
152152
"branch": "master",
153153
"branch_mapping": {}
154154
},
155+
{
156+
"path_to_root": "functions-azure-product",
157+
"url": "https://github.com/Azure/Azure-Functions",
158+
"branch": "main",
159+
"branch_mapping": {}
160+
},
155161
{
156162
"path_to_root": "functions-pytorch",
157163
"url": "https://github.com/Azure-Samples/functions-python-pytorch-tutorial",
@@ -164,6 +170,12 @@
164170
"branch": "dev",
165171
"branch_mapping": {}
166172
},
173+
{
174+
"path_to_root": "functions-quickstart-templates-v1",
175+
"url": "https://github.com/Azure/azure-functions-templates",
176+
"branch": "v1.x",
177+
"branch_mapping": {}
178+
},
167179
{
168180
"path_to_root": "azure-functions-samples-java",
169181
"url": "https://github.com/Azure-Samples/azure-functions-samples-java",
@@ -212,6 +224,12 @@
212224
"branch": "main",
213225
"branch_mapping": {}
214226
},
227+
{
228+
"path_to_root": "azure-functions-durable-js",
229+
"url": "https://github.com/Azure/azure-functions-durable-js",
230+
"branch": "main",
231+
"branch_mapping": {}
232+
},
215233
{
216234
"path_to_root": "azure-functions-kafka-extension",
217235
"url": "https://github.com/Azure/azure-functions-kafka-extension",
@@ -368,6 +386,12 @@
368386
"branch": "main",
369387
"branch_mapping": {}
370388
},
389+
{
390+
"path_to_root": "azureml-examples-mavaisma-r-azureml",
391+
"url": "https://github.com/azure/azureml-examples",
392+
"branch": "mavaisma-r-azureml",
393+
"branch_mapping": {}
394+
},
371395
{
372396
"path_to_root": "azureml-examples-v2samplesreorg",
373397
"url": "https://github.com/azure/azureml-examples",
@@ -731,7 +755,7 @@
731755
{
732756
"path_to_root": "azure-spring-apps-reference-architecture",
733757
"url": "https://github.com/Azure/azure-spring-apps-reference-architecture",
734-
"branch": "main",
758+
"branch": "reference-architecture",
735759
"branch_mapping": {}
736760
},
737761
{
@@ -849,9 +873,15 @@
849873
"branch_mapping": {}
850874
},
851875
{
852-
"path_to_root": "azure-cosmos-dotnet-v3",
853-
"url": "https://github.com/Azure-Samples/cosmos-db-sql-api-dotnet-samples",
854-
"branch": "v3",
876+
"path_to_root": "cosmos-db-nosql-dotnet-samples",
877+
"url": "https://github.com/azure-samples/cosmos-db-nosql-dotnet-samples",
878+
"branch": "main",
879+
"branch_mapping": {}
880+
},
881+
{
882+
"path_to_root": "cosmos-db-nosql-python-samples",
883+
"url": "https://github.com/azure-samples/cosmos-db-nosql-python-samples",
884+
"branch": "main",
855885
"branch_mapping": {}
856886
},
857887
{
@@ -867,10 +897,16 @@
867897
"branch_mapping": {}
868898
},
869899
{
870-
"path_to_root": "reusable-content",
900+
"path_to_root": "articles/reusable-content",
871901
"url": "https://github.com/MicrosoftDocs/reusable-content",
872902
"branch": "main",
873903
"branch_mapping": {}
904+
},
905+
{
906+
"path_to_root": "azure-cosmos-db-mongodb-python-getting-started",
907+
"url": "https://github.com/Azure-Samples/azure-cosmos-db-mongodb-python-getting-started",
908+
"branch": "main",
909+
"branch_mapping": {}
874910
}
875911
],
876912
"branch_target_mapping": {
@@ -908,6 +944,7 @@
908944
".openpublishing.redirection.azure-percept.json",
909945
".openpublishing.redirection.azure-productivity.json",
910946
".openpublishing.redirection.azure-australia.json",
947+
".openpublishing.redirection.iot-hub-device-update.json",
911948
"articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
912949
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
913950
"articles/azure-relay/.openpublishing.redirection.relay.json",
@@ -925,6 +962,7 @@
925962
"articles/iot-accelerators/.openpublishing.redirection.iot-accelerators.json",
926963
"articles/iot-develop/.openpublishing.redirection.iot-develop.json",
927964
"articles/iot-edge/.openpublishing.redirection.iot-edge.json",
965+
"articles/iot-fundamentals/.openpublishing.redirection.iot-fundamentals.json",
928966
"articles/mariadb/.openpublishing.redirection.mariadb.json",
929967
"articles/marketplace/.openpublishing.redirection.marketplace.json",
930968
"articles/mysql/.openpublishing.redirection.mysql.json",
@@ -948,9 +986,11 @@
948986
".openpublishing.redirection.virtual-desktop.json",
949987
".openpublishing.redirection.deployment-environments.json",
950988
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-services.json",
951-
"articles/applied-ai-services/.openpublishing.archived.json",
989+
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-old.json",
952990
"articles/cognitive-services/.openpublishing.redirection.cognitive-services.json",
953991
".openpublishing.redirection.baremetal-infrastructure.json",
954-
"articles/iot-dps/.openpublishing.redirection.iot-dps.json"
992+
"articles/iot-dps/.openpublishing.redirection.iot-dps.json",
993+
"articles/cloud-shell/.openpublishing.redirection.cloud-shell.json",
994+
".openpublishing.redirection.azure-vmware.json"
955995
]
956996
}

.openpublishing.redirection.active-directory.json

Lines changed: 61 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,26 @@
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/iauditor-tutorial.md",
50+
"redirect_url": "/azure/active-directory/saas-apps/safety-culture-tutorial",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path_from_root": "/articles/active-directory/saas-apps/icertisicm-tutorial.md",
55+
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
56+
"redirect_document_id": false
57+
},
4858
{
4959
"source_path_from_root": "/articles/active-directory/governance/tutorial-onboard-custom-workflow-graph.md",
5060
"redirect_url": "/graph/tutorial-lifecycle-workflows-onboard-custom-workflow",
5161
"redirect_document_id": false
5262
},
63+
{
64+
"source_path_from_root": "/articles/active-directory/governance/lifecycle-workflows-developer-reference.md",
65+
"redirect_url": "/graph/api/resources/identitygovernance-workflow",
66+
"redirect_document_id": false
67+
},
5368
{
5469
"source_path_from_root": "/articles/active-directory/governance/tutorial-offboard-custom-workflow-graph.md",
5570
"redirect_url": "/graph/tutorial-lifecycle-workflows-offboard-custom-workflow",
@@ -112,7 +127,7 @@
112127
},
113128
{
114129
"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",
130+
"redirect_url": "/azure/active-directory/develop/v2-overview",
116131
"redirect_document_id": false
117132
},
118133
{
@@ -1897,7 +1912,7 @@
18971912
},
18981913
{
18991914
"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",
1915+
"redirect_url": "/azure/active-directory/develop/v2-overview",
19011916
"redirect_document_id": false
19021917
},
19031918
{
@@ -1927,8 +1942,8 @@
19271942
},
19281943
{
19291944
"source_path_from_root": "/articles/active-directory/active-directory-b2b-add-user-without-invite.md",
1930-
"redirect_url": "/azure/active-directory/b2b/add-user-without-invite",
1931-
"redirect_document_id": true
1945+
"redirect_url": "/azure/active-directory/external-identities/redemption-experience",
1946+
"redirect_document_id": false
19321947
},
19331948
{
19341949
"source_path_from_root": "/articles/active-directory/active-directory-b2b-allow-deny-list.md",
@@ -3433,17 +3448,17 @@
34333448
},
34343449
{
34353450
"source_path_from_root": "/articles/active-directory/develop/active-directory-permissions.md",
3436-
"redirect_url": "/azure/active-directory/develop/v2-permissions-and-consent",
3451+
"redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
34373452
"redirect_document_id": false
34383453
},
34393454
{
34403455
"source_path_from_root": "/articles/active-directory/develop/active-directory-v2-scopes.md",
3441-
"redirect_url": "/azure/active-directory/develop/v2-permissions-and-consent",
3456+
"redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
34423457
"redirect_document_id": false
34433458
},
34443459
{
34453460
"source_path_from_root": "/articles/active-directory/develop/v1-permissions-and-consent.md",
3446-
"redirect_url": "/azure/active-directory/develop/v2-permissions-and-consent",
3461+
"redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
34473462
"redirect_document_id": false
34483463
},
34493464
{
@@ -3893,8 +3908,8 @@
38933908
},
38943909
{
38953910
"source_path_from_root": "/articles/active-directory/b2b/add-user-without-invite.md",
3896-
"redirect_url": "/azure/active-directory/external-identities/add-user-without-invite",
3897-
"redirect_document_id": true
3911+
"redirect_url": "/azure/active-directory/external-identities/redemption-experience",
3912+
"redirect_document_id": false
38983913
},
38993914
{
39003915
"source_path_from_root": "/articles/active-directory/b2b/allow-deny-list.md",
@@ -4074,7 +4089,7 @@
40744089
{
40754090
"source_path_from_root": "/articles/active-directory/b2b/redemption-experience.md",
40764091
"redirect_url": "/azure/active-directory/external-identities/redemption-experience",
4077-
"redirect_document_id": true
4092+
"redirect_document_id": false
40784093
},
40794094
{
40804095
"source_path_from_root": "/articles/active-directory/b2b/self-service-portal.md",
@@ -4336,6 +4351,21 @@
43364351
"redirect_url": "/azure/active-directory/conditional-access/location-condition",
43374352
"redirect_document_id": true
43384353
},
4354+
{
4355+
"source_path_from_root": "/articles/active-directory/reports-monitoring/howto-find-activity-reports.md",
4356+
"redirect_url": "/azure/active-directory/reports-monitoring/howto-access-activity-logs",
4357+
"redirect_document_id": true
4358+
},
4359+
{
4360+
"source_path_from_root": "/articles/active-directory/reports-monitoring/troubleshoot-missing-data-download.md",
4361+
"redirect_url": "/azure/active-directory/reports-monitoring/reports-faq",
4362+
"redirect_document_id": false
4363+
},
4364+
{
4365+
"source_path_from_root": "/articles/active-directory/reports-monitoring/troubleshoot-missing-audit-data.md",
4366+
"redirect_url": "/azure/active-directory/reports-monitoring/reports-faq",
4367+
"redirect_document_id": false
4368+
},
43394369
{
43404370
"source_path_from_root": "/articles/active-directory/customize-branding.md",
43414371
"redirect_url": "/azure/active-directory/fundamentals/customize-branding",
@@ -5536,6 +5566,21 @@
55365566
"redirect_url": "/azure/active-directory/app-proxy/application-proxy-add-on-premises-application",
55375567
"redirect_document_id": true
55385568
},
5569+
{
5570+
"source_path_from_root": "/articles/active-directory/develop/consent-framework.md",
5571+
"redirect_url": "/azure/active-directory/develop/application-consent-experience",
5572+
"redirect_document_id": false
5573+
},
5574+
{
5575+
"source_path_from_root": "/articles/active-directory/develop/v2-permissions-and-consent.md",
5576+
"redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
5577+
"redirect_document_id": false
5578+
},
5579+
{
5580+
"source_path_from_root": "/articles/active-directory/manage-apps/consent-and-permissions-overview.md",
5581+
"redirect_url": "/azure/active-directory/manage-apps/user-admin-consent-overview",
5582+
"redirect_document_id": false
5583+
},
55395584
{
55405585
"source_path_from_root": "/articles/active-directory/manage-apps/application-proxy-enable.md",
55415586
"redirect_url": "/azure/active-directory/app-proxy/application-proxy-add-on-premises-application",
@@ -10896,6 +10941,11 @@
1089610941
"redirect_url": "/azure/azure-percept/index",
1089710942
"redirect_document_id": false
1089810943
},
10944+
{
10945+
"source_path_from_root": "/articles/active-directory/reports-monitoring/howto-install-use-log-analytics-views.md",
10946+
"redirect_url": "/azure/azure-monitor/visualize/workbooks-view-designer-conversion-overview",
10947+
"redirect_document_id": false
10948+
},
1089910949
{
1090010950
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-create-azure-portal.md",
1090110951
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
@@ -10933,7 +10983,7 @@
1093310983
},
1093410984
{
1093510985
"source_path_from_root": "/articles/active-directory/fundamentals/keep-me-signed-in.md",
10936-
"redirect_url": "/azure/active-directory/fundamentals/customize-branding",
10986+
"redirect_url": "/azure/active-directory/fundamentals/active-directory-users-profile-azure-portal",
1093710987
"redirect_document_id": false
1093810988
},
1093910989
{
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+
}

0 commit comments

Comments
 (0)