Skip to content

Commit 66ce02a

Browse files
authored
Merge branch 'main' into QA+QnA-Bugs
2 parents fb8f6d3 + fa8d259 commit 66ce02a

File tree

16,605 files changed

+316300
-175682
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,605 files changed

+316300
-175682
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: 48 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": {
@@ -890,6 +926,7 @@
890926
".openpublishing.redirection.json",
891927
".openpublishing.redirection.azure-arc-data.json",
892928
".openpublishing.redirection.active-directory.json",
929+
".openpublishing.redirection.api-management.json",
893930
".openpublishing.redirection.azure-attestation.json",
894931
".openpublishing.redirection.azure-blob.json",
895932
"articles/data-factory/.openpublishing.redirection.data-factory.json",
@@ -908,6 +945,7 @@
908945
".openpublishing.redirection.azure-percept.json",
909946
".openpublishing.redirection.azure-productivity.json",
910947
".openpublishing.redirection.azure-australia.json",
948+
".openpublishing.redirection.iot-hub-device-update.json",
911949
"articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
912950
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
913951
"articles/azure-relay/.openpublishing.redirection.relay.json",
@@ -925,6 +963,7 @@
925963
"articles/iot-accelerators/.openpublishing.redirection.iot-accelerators.json",
926964
"articles/iot-develop/.openpublishing.redirection.iot-develop.json",
927965
"articles/iot-edge/.openpublishing.redirection.iot-edge.json",
966+
"articles/iot-fundamentals/.openpublishing.redirection.iot-fundamentals.json",
928967
"articles/mariadb/.openpublishing.redirection.mariadb.json",
929968
"articles/marketplace/.openpublishing.redirection.marketplace.json",
930969
"articles/mysql/.openpublishing.redirection.mysql.json",
@@ -948,9 +987,11 @@
948987
".openpublishing.redirection.virtual-desktop.json",
949988
".openpublishing.redirection.deployment-environments.json",
950989
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-services.json",
951-
"articles/applied-ai-services/.openpublishing.archived.json",
990+
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-old.json",
952991
"articles/cognitive-services/.openpublishing.redirection.cognitive-services.json",
953992
".openpublishing.redirection.baremetal-infrastructure.json",
954-
"articles/iot-dps/.openpublishing.redirection.iot-dps.json"
993+
"articles/iot-dps/.openpublishing.redirection.iot-dps.json",
994+
"articles/cloud-shell/.openpublishing.redirection.cloud-shell.json",
995+
".openpublishing.redirection.azure-vmware.json"
955996
]
956997
}

.openpublishing.redirection.active-directory.json

Lines changed: 71 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,36 @@
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+
},
58+
{
59+
"source_path_from_root": "/articles/active-directory/saas-apps/otsuka-shokai-tutorial.md",
60+
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path_from_root": "/articles/active-directory/saas-apps/netsuite-provisioning-tutorial.md",
65+
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
66+
"redirect_document_id": false
67+
},
4868
{
4969
"source_path_from_root": "/articles/active-directory/governance/tutorial-onboard-custom-workflow-graph.md",
5070
"redirect_url": "/graph/tutorial-lifecycle-workflows-onboard-custom-workflow",
5171
"redirect_document_id": false
5272
},
73+
{
74+
"source_path_from_root": "/articles/active-directory/governance/lifecycle-workflows-developer-reference.md",
75+
"redirect_url": "/graph/api/resources/identitygovernance-workflow",
76+
"redirect_document_id": false
77+
},
5378
{
5479
"source_path_from_root": "/articles/active-directory/governance/tutorial-offboard-custom-workflow-graph.md",
5580
"redirect_url": "/graph/tutorial-lifecycle-workflows-offboard-custom-workflow",
@@ -112,7 +137,7 @@
112137
},
113138
{
114139
"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",
140+
"redirect_url": "/azure/active-directory/develop/v2-overview",
116141
"redirect_document_id": false
117142
},
118143
{
@@ -1897,7 +1922,7 @@
18971922
},
18981923
{
18991924
"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",
1925+
"redirect_url": "/azure/active-directory/develop/v2-overview",
19011926
"redirect_document_id": false
19021927
},
19031928
{
@@ -1927,8 +1952,8 @@
19271952
},
19281953
{
19291954
"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
1955+
"redirect_url": "/azure/active-directory/external-identities/redemption-experience",
1956+
"redirect_document_id": false
19321957
},
19331958
{
19341959
"source_path_from_root": "/articles/active-directory/active-directory-b2b-allow-deny-list.md",
@@ -3433,17 +3458,17 @@
34333458
},
34343459
{
34353460
"source_path_from_root": "/articles/active-directory/develop/active-directory-permissions.md",
3436-
"redirect_url": "/azure/active-directory/develop/v2-permissions-and-consent",
3461+
"redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
34373462
"redirect_document_id": false
34383463
},
34393464
{
34403465
"source_path_from_root": "/articles/active-directory/develop/active-directory-v2-scopes.md",
3441-
"redirect_url": "/azure/active-directory/develop/v2-permissions-and-consent",
3466+
"redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
34423467
"redirect_document_id": false
34433468
},
34443469
{
34453470
"source_path_from_root": "/articles/active-directory/develop/v1-permissions-and-consent.md",
3446-
"redirect_url": "/azure/active-directory/develop/v2-permissions-and-consent",
3471+
"redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
34473472
"redirect_document_id": false
34483473
},
34493474
{
@@ -3893,8 +3918,8 @@
38933918
},
38943919
{
38953920
"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
3921+
"redirect_url": "/azure/active-directory/external-identities/redemption-experience",
3922+
"redirect_document_id": false
38983923
},
38993924
{
39003925
"source_path_from_root": "/articles/active-directory/b2b/allow-deny-list.md",
@@ -4074,7 +4099,7 @@
40744099
{
40754100
"source_path_from_root": "/articles/active-directory/b2b/redemption-experience.md",
40764101
"redirect_url": "/azure/active-directory/external-identities/redemption-experience",
4077-
"redirect_document_id": true
4102+
"redirect_document_id": false
40784103
},
40794104
{
40804105
"source_path_from_root": "/articles/active-directory/b2b/self-service-portal.md",
@@ -4336,6 +4361,21 @@
43364361
"redirect_url": "/azure/active-directory/conditional-access/location-condition",
43374362
"redirect_document_id": true
43384363
},
4364+
{
4365+
"source_path_from_root": "/articles/active-directory/reports-monitoring/howto-find-activity-reports.md",
4366+
"redirect_url": "/azure/active-directory/reports-monitoring/howto-access-activity-logs",
4367+
"redirect_document_id": true
4368+
},
4369+
{
4370+
"source_path_from_root": "/articles/active-directory/reports-monitoring/troubleshoot-missing-data-download.md",
4371+
"redirect_url": "/azure/active-directory/reports-monitoring/reports-faq",
4372+
"redirect_document_id": false
4373+
},
4374+
{
4375+
"source_path_from_root": "/articles/active-directory/reports-monitoring/troubleshoot-missing-audit-data.md",
4376+
"redirect_url": "/azure/active-directory/reports-monitoring/reports-faq",
4377+
"redirect_document_id": false
4378+
},
43394379
{
43404380
"source_path_from_root": "/articles/active-directory/customize-branding.md",
43414381
"redirect_url": "/azure/active-directory/fundamentals/customize-branding",
@@ -5536,6 +5576,21 @@
55365576
"redirect_url": "/azure/active-directory/app-proxy/application-proxy-add-on-premises-application",
55375577
"redirect_document_id": true
55385578
},
5579+
{
5580+
"source_path_from_root": "/articles/active-directory/develop/consent-framework.md",
5581+
"redirect_url": "/azure/active-directory/develop/application-consent-experience",
5582+
"redirect_document_id": false
5583+
},
5584+
{
5585+
"source_path_from_root": "/articles/active-directory/develop/v2-permissions-and-consent.md",
5586+
"redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
5587+
"redirect_document_id": false
5588+
},
5589+
{
5590+
"source_path_from_root": "/articles/active-directory/manage-apps/consent-and-permissions-overview.md",
5591+
"redirect_url": "/azure/active-directory/manage-apps/user-admin-consent-overview",
5592+
"redirect_document_id": false
5593+
},
55395594
{
55405595
"source_path_from_root": "/articles/active-directory/manage-apps/application-proxy-enable.md",
55415596
"redirect_url": "/azure/active-directory/app-proxy/application-proxy-add-on-premises-application",
@@ -10896,6 +10951,11 @@
1089610951
"redirect_url": "/azure/azure-percept/index",
1089710952
"redirect_document_id": false
1089810953
},
10954+
{
10955+
"source_path_from_root": "/articles/active-directory/reports-monitoring/howto-install-use-log-analytics-views.md",
10956+
"redirect_url": "/azure/azure-monitor/visualize/workbooks-view-designer-conversion-overview",
10957+
"redirect_document_id": false
10958+
},
1089910959
{
1090010960
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-create-azure-portal.md",
1090110961
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
@@ -10933,7 +10993,7 @@
1093310993
},
1093410994
{
1093510995
"source_path_from_root": "/articles/active-directory/fundamentals/keep-me-signed-in.md",
10936-
"redirect_url": "/azure/active-directory/fundamentals/customize-branding",
10996+
"redirect_url": "/azure/active-directory/fundamentals/active-directory-users-profile-azure-portal",
1093710997
"redirect_document_id": false
1093810998
},
1093910999
{

0 commit comments

Comments
 (0)