Skip to content

Commit f83ae42

Browse files
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into Add-AWS-regulatory-standard
2 parents d9806db + 2d6c758 commit f83ae42

File tree

13,123 files changed

+216100
-117710
lines changed

Some content is hidden

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

13,123 files changed

+216100
-117710
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: 34 additions & 6 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
{
@@ -867,10 +885,16 @@
867885
"branch_mapping": {}
868886
},
869887
{
870-
"path_to_root": "reusable-content",
888+
"path_to_root": "articles/reusable-content",
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": {
@@ -908,6 +932,7 @@
908932
".openpublishing.redirection.azure-percept.json",
909933
".openpublishing.redirection.azure-productivity.json",
910934
".openpublishing.redirection.azure-australia.json",
935+
".openpublishing.redirection.iot-hub-device-update.json",
911936
"articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
912937
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
913938
"articles/azure-relay/.openpublishing.redirection.relay.json",
@@ -925,6 +950,7 @@
925950
"articles/iot-accelerators/.openpublishing.redirection.iot-accelerators.json",
926951
"articles/iot-develop/.openpublishing.redirection.iot-develop.json",
927952
"articles/iot-edge/.openpublishing.redirection.iot-edge.json",
953+
"articles/iot-fundamentals/.openpublishing.redirection.iot-fundamentals.json",
928954
"articles/mariadb/.openpublishing.redirection.mariadb.json",
929955
"articles/marketplace/.openpublishing.redirection.marketplace.json",
930956
"articles/mysql/.openpublishing.redirection.mysql.json",
@@ -948,9 +974,11 @@
948974
".openpublishing.redirection.virtual-desktop.json",
949975
".openpublishing.redirection.deployment-environments.json",
950976
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-services.json",
951-
"articles/applied-ai-services/.openpublishing.archived.json",
977+
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-old.json",
952978
"articles/cognitive-services/.openpublishing.redirection.cognitive-services.json",
953979
".openpublishing.redirection.baremetal-infrastructure.json",
954-
"articles/iot-dps/.openpublishing.redirection.iot-dps.json"
980+
"articles/iot-dps/.openpublishing.redirection.iot-dps.json",
981+
"articles/cloud-shell/.openpublishing.redirection.cloud-shell.json",
982+
".openpublishing.redirection.azure-vmware.json"
955983
]
956984
}

.openpublishing.redirection.active-directory.json

Lines changed: 46 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/active-directory/authentication/how-to-mfa-microsoft-managed.md",
5+
"redirect_url": "/azure/active-directory/authentication/concept-authentication-default-enablement",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path_from_root": "/articles/active-directory/authentication/concept-certificate-based-authentication-mobile.md",
510
"redirect_url": "/azure/active-directory/authentication/concept-certificate-based-authentication-mobile-ios",
@@ -40,11 +45,26 @@
4045
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
4146
"redirect_document_id": false
4247
},
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+
},
4358
{
4459
"source_path_from_root": "/articles/active-directory/governance/tutorial-onboard-custom-workflow-graph.md",
4560
"redirect_url": "/graph/tutorial-lifecycle-workflows-onboard-custom-workflow",
4661
"redirect_document_id": false
4762
},
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+
},
4868
{
4969
"source_path_from_root": "/articles/active-directory/governance/tutorial-offboard-custom-workflow-graph.md",
5070
"redirect_url": "/graph/tutorial-lifecycle-workflows-offboard-custom-workflow",
@@ -107,7 +127,7 @@
107127
},
108128
{
109129
"source_path_from_root": "/articles/active-directory/develop/active-directory-v2-limitations.md",
110-
"redirect_url": "/azure/active-directory/azuread-dev/azure-ad-endpoint-comparison",
130+
"redirect_url": "/azure/active-directory/develop/v2-overview",
111131
"redirect_document_id": false
112132
},
113133
{
@@ -1892,7 +1912,7 @@
18921912
},
18931913
{
18941914
"source_path_from_root": "/articles/active-directory/develop/azure-ad-endpoint-comparison.md",
1895-
"redirect_url": "/azure/active-directory/azuread-dev/azure-ad-endpoint-comparison",
1915+
"redirect_url": "/azure/active-directory/develop/v2-overview",
18961916
"redirect_document_id": false
18971917
},
18981918
{
@@ -3428,17 +3448,17 @@
34283448
},
34293449
{
34303450
"source_path_from_root": "/articles/active-directory/develop/active-directory-permissions.md",
3431-
"redirect_url": "/azure/active-directory/develop/v2-permissions-and-consent",
3451+
"redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
34323452
"redirect_document_id": false
34333453
},
34343454
{
34353455
"source_path_from_root": "/articles/active-directory/develop/active-directory-v2-scopes.md",
3436-
"redirect_url": "/azure/active-directory/develop/v2-permissions-and-consent",
3456+
"redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
34373457
"redirect_document_id": false
34383458
},
34393459
{
34403460
"source_path_from_root": "/articles/active-directory/develop/v1-permissions-and-consent.md",
3441-
"redirect_url": "/azure/active-directory/develop/v2-permissions-and-consent",
3461+
"redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
34423462
"redirect_document_id": false
34433463
},
34443464
{
@@ -5531,6 +5551,21 @@
55315551
"redirect_url": "/azure/active-directory/app-proxy/application-proxy-add-on-premises-application",
55325552
"redirect_document_id": true
55335553
},
5554+
{
5555+
"source_path_from_root": "/articles/active-directory/develop/consent-framework.md",
5556+
"redirect_url": "/azure/active-directory/develop/application-consent-experience",
5557+
"redirect_document_id": false
5558+
},
5559+
{
5560+
"source_path_from_root": "/articles/active-directory/develop/v2-permissions-and-consent.md",
5561+
"redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
5562+
"redirect_document_id": false
5563+
},
5564+
{
5565+
"source_path_from_root": "/articles/active-directory/manage-apps/consent-and-permissions-overview.md",
5566+
"redirect_url": "/azure/active-directory/manage-apps/user-admin-consent-overview",
5567+
"redirect_document_id": false
5568+
},
55345569
{
55355570
"source_path_from_root": "/articles/active-directory/manage-apps/application-proxy-enable.md",
55365571
"redirect_url": "/azure/active-directory/app-proxy/application-proxy-add-on-premises-application",
@@ -10891,6 +10926,11 @@
1089110926
"redirect_url": "/azure/azure-percept/index",
1089210927
"redirect_document_id": false
1089310928
},
10929+
{
10930+
"source_path_from_root": "/articles/active-directory/reports-monitoring/howto-install-use-log-analytics-views.md",
10931+
"redirect_url": "/azure/azure-monitor/visualize/workbooks-view-designer-conversion-overview",
10932+
"redirect_document_id": false
10933+
},
1089410934
{
1089510935
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-create-azure-portal.md",
1089610936
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
@@ -10928,7 +10968,7 @@
1092810968
},
1092910969
{
1093010970
"source_path_from_root": "/articles/active-directory/fundamentals/keep-me-signed-in.md",
10931-
"redirect_url": "/azure/active-directory/fundamentals/customize-branding",
10971+
"redirect_url": "/azure/active-directory/fundamentals/active-directory-users-profile-azure-portal",
1093210972
"redirect_document_id": false
1093310973
},
1093410974
{
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)