Skip to content

Commit 033d2b4

Browse files
authored
Merge branch 'main' into heoelri-patch-1
2 parents 396370f + d767612 commit 033d2b4

File tree

12,330 files changed

+274349
-173485
lines changed

Some content is hidden

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

12,330 files changed

+274349
-173485
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: 28 additions & 8 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",
@@ -849,9 +855,15 @@
849855
"branch_mapping": {}
850856
},
851857
{
852-
"path_to_root": "azure-cosmos-dotnet-v3",
853-
"url": "https://github.com/Azure-Samples/cosmos-db-sql-api-dotnet-samples",
854-
"branch": "v3",
858+
"path_to_root": "cosmos-db-nosql-dotnet-samples",
859+
"url": "https://github.com/azure-samples/cosmos-db-nosql-dotnet-samples",
860+
"branch": "main",
861+
"branch_mapping": {}
862+
},
863+
{
864+
"path_to_root": "cosmos-db-nosql-python-samples",
865+
"url": "https://github.com/azure-samples/cosmos-db-nosql-python-samples",
866+
"branch": "main",
855867
"branch_mapping": {}
856868
},
857869
{
@@ -867,10 +879,16 @@
867879
"branch_mapping": {}
868880
},
869881
{
870-
"path_to_root": "reusable-content",
882+
"path_to_root": "articles/reusable-content",
871883
"url": "https://github.com/MicrosoftDocs/reusable-content",
872884
"branch": "main",
873885
"branch_mapping": {}
886+
},
887+
{
888+
"path_to_root": "azure-cosmos-db-mongodb-python-getting-started",
889+
"url": "https://github.com/Azure-Samples/azure-cosmos-db-mongodb-python-getting-started",
890+
"branch": "main",
891+
"branch_mapping": {}
874892
}
875893
],
876894
"branch_target_mapping": {
@@ -896,7 +914,7 @@
896914
".openpublishing.redirection.defender-for-cloud.json",
897915
".openpublishing.redirection.defender-for-iot.json",
898916
".openpublishing.redirection.healthcare-apis.json",
899-
".openpublishing.redirection.iot-hub.json",
917+
"articles/iot-hub/.openpublishing.redirection.iot-hub.json",
900918
".openpublishing.redirection.app-service.json",
901919
".openpublishing.redirection.key-vault.json",
902920
".openpublishing.redirection.sql-database.json",
@@ -908,6 +926,7 @@
908926
".openpublishing.redirection.azure-percept.json",
909927
".openpublishing.redirection.azure-productivity.json",
910928
".openpublishing.redirection.azure-australia.json",
929+
".openpublishing.redirection.iot-hub-device-update.json",
911930
"articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
912931
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
913932
"articles/azure-relay/.openpublishing.redirection.relay.json",
@@ -946,10 +965,11 @@
946965
"articles/machine-learning/.openpublishing.redirection.machine-learning.json",
947966
"articles/static-web-apps/.openpublishing.redirection.static-web-apps.json",
948967
".openpublishing.redirection.virtual-desktop.json",
968+
".openpublishing.redirection.deployment-environments.json",
949969
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-services.json",
950-
"articles/applied-ai-services/.openpublishing.archived.json",
970+
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-old.json",
951971
"articles/cognitive-services/.openpublishing.redirection.cognitive-services.json",
952-
".openpublishing.redirection.baremetal-infrastructure.json"
953-
972+
".openpublishing.redirection.baremetal-infrastructure.json",
973+
"articles/iot-dps/.openpublishing.redirection.iot-dps.json"
954974
]
955975
}

.openpublishing.redirection.active-directory.json

Lines changed: 85 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
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+
},
8+
{
9+
"source_path_from_root": "/articles/active-directory/authentication/concept-certificate-based-authentication-mobile.md",
10+
"redirect_url": "/azure/active-directory/authentication/concept-certificate-based-authentication-mobile-ios",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/active-directory/authentication/troubleshoot-certificate-based-authentication.md",
15+
"redirect_url": "/azure/active-directory/authentication/certificate-based-authentication-faq",
16+
"redirect_document_id": false
17+
},
318
{
419
"source_path_from_root": "/articles/active-directory/manage-apps/my-apps-deployment-plan.md",
520
"redirect_url": "/azure/active-directory/manage-apps/myapps-overview",
@@ -30,6 +45,41 @@
3045
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
3146
"redirect_document_id": false
3247
},
48+
{
49+
"source_path_from_root": "/articles/active-directory/governance/tutorial-onboard-custom-workflow-graph.md",
50+
"redirect_url": "/graph/tutorial-lifecycle-workflows-onboard-custom-workflow",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path_from_root": "/articles/active-directory/governance/tutorial-offboard-custom-workflow-graph.md",
55+
"redirect_url": "/graph/tutorial-lifecycle-workflows-offboard-custom-workflow",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path_from_root": "/articles/active-directory/governance/tutorial-scheduled-leaver-graph.md",
60+
"redirect_url": "/graph/tutorial-lifecycle-workflows-scheduled-leaver",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path_from_root": "/articles/active-directory/governance/set-employee-leave-date-time.md",
65+
"redirect_url": "/graph/tutorial-lifecycle-workflows-set-employeeleavedatetime",
66+
"redirect_document_id": false
67+
},
68+
{
69+
"source_path_from_root": "/articles/active-directory/saas-apps/keylight-tutorial.md",
70+
"redirect_url": "/azure/active-directory/saas-apps/navex-irm-keylight-lockpath-tutorial",
71+
"redirect_document_id": false
72+
},
73+
{
74+
"source_path_from_root": "/articles/active-directory/saas-apps/headerf5-tutorial.md",
75+
"redirect_url": "/azure/active-directory/saas-apps/f5-big-ip-headers-easy-button",
76+
"redirect_document_id": false
77+
},
78+
{
79+
"source_path_from_root": "/articles/active-directory/saas-apps/oracle-peoplesoft-protected-by-f5-big-ip-apm-tutorial.md",
80+
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
81+
"redirect_document_id": false
82+
},
3383
{
3484
"source_path_from_root": "/articles/active-directory/fundamentals/whats-new-microsoft-365-government.md",
3585
"redirect_url": "/azure/active-directory/fundamentals/whats-new",
@@ -370,6 +420,11 @@
370420
"redirect_url": "/azure/active-directory/saas-apps/cwt-tutorial",
371421
"redirect_document_id": false
372422
},
423+
{
424+
"source_path_from_root": "/articles/active-directory/saas-apps/eopen-cm-tutorial.md",
425+
"redirect_url": "/azure/active-directory/saas-apps/e2open-cm-tutorial",
426+
"redirect_document_id": false
427+
},
373428
{
374429
"source_path_from_root": "/articles/active-directory/active-directory-saas-fax.plus-tutorial.md",
375430
"redirect_url": "/articles/active-directory/saas-apps/fax-plus-tutorial",
@@ -3378,17 +3433,17 @@
33783433
},
33793434
{
33803435
"source_path_from_root": "/articles/active-directory/develop/active-directory-permissions.md",
3381-
"redirect_url": "/azure/active-directory/develop/v2-permissions-and-consent",
3436+
"redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
33823437
"redirect_document_id": false
33833438
},
33843439
{
33853440
"source_path_from_root": "/articles/active-directory/develop/active-directory-v2-scopes.md",
3386-
"redirect_url": "/azure/active-directory/develop/v2-permissions-and-consent",
3441+
"redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
33873442
"redirect_document_id": false
33883443
},
33893444
{
33903445
"source_path_from_root": "/articles/active-directory/develop/v1-permissions-and-consent.md",
3391-
"redirect_url": "/azure/active-directory/develop/v2-permissions-and-consent",
3446+
"redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
33923447
"redirect_document_id": false
33933448
},
33943449
{
@@ -5481,6 +5536,21 @@
54815536
"redirect_url": "/azure/active-directory/app-proxy/application-proxy-add-on-premises-application",
54825537
"redirect_document_id": true
54835538
},
5539+
{
5540+
"source_path_from_root": "/articles/active-directory/develop/consent-framework.md",
5541+
"redirect_url": "/azure/active-directory/develop/application-consent-experience",
5542+
"redirect_document_id": false
5543+
},
5544+
{
5545+
"source_path_from_root": "/articles/active-directory/develop/v2-permissions-and-consent.md",
5546+
"redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
5547+
"redirect_document_id": false
5548+
},
5549+
{
5550+
"source_path_from_root": "/articles/active-directory/manage-apps/consent-and-permissions-overview.md",
5551+
"redirect_url": "/azure/active-directory/manage-apps/user-admin-consent-overview",
5552+
"redirect_document_id": false
5553+
},
54845554
{
54855555
"source_path_from_root": "/articles/active-directory/manage-apps/application-proxy-enable.md",
54865556
"redirect_url": "/azure/active-directory/app-proxy/application-proxy-add-on-premises-application",
@@ -10846,57 +10916,57 @@
1084610916
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
1084710917
"redirect_document_id": false
1084810918
},
10849-
{
10919+
{
1085010920
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-members-azure-portal.md",
1085110921
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
1085210922
"redirect_document_id": false
1085310923
},
10854-
{
10924+
{
1085510925
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-delete-group.md",
1085610926
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
1085710927
"redirect_document_id": false
1085810928
},
10859-
{
10929+
{
1086010930
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-membership-azure-portal.md",
1086110931
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
1086210932
"redirect_document_id": false
1086310933
},
10864-
{
10934+
{
1086510935
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-settings-azure-portal.md",
1086610936
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
1086710937
"redirect_document_id": false
1086810938
},
10869-
{
10939+
{
1087010940
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-accessmanagement-managing-group-owners.md",
1087110941
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
1087210942
"redirect_document_id": false
1087310943
},
10874-
{
10944+
{
1087510945
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-manage-groups.md",
1087610946
"redirect_url": "/azure/active-directory/fundamentals/concept-learn-about-groups",
1087710947
"redirect_document_id": false
10878-
},
10879-
{
10948+
},
10949+
{
1088010950
"source_path_from_root": "/articles/active-directory/fundamentals/keep-me-signed-in.md",
1088110951
"redirect_url": "/azure/active-directory/fundamentals/customize-branding",
1088210952
"redirect_document_id": false
1088310953
},
10884-
{
10954+
{
1088510955
"source_path_from_root": "/articles/active-directory/cloud-infrastructure-entitlement-management/product-integrations.md",
1088610956
"redirect_url": "/azure/active-directory/cloud-infrastructure-entitlement-management",
1088710957
"redirect_document_id": false
1088810958
},
10889-
{
10959+
{
1089010960
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-troubleshooting-support-howto.md",
1089110961
"redirect_url": "/azure/active-directory/fundamentals/how-to-get-support",
1089210962
"redirect_document_id": false
1089310963
},
10894-
{
10964+
{
1089510965
"source_path_from_root": "/articles/active-directory/fundamentals/support-help-options.md",
1089610966
"redirect_url": "/azure/active-directory/fundamentals/how-to-get-support",
1089710967
"redirect_document_id": false
1089810968
},
10899-
{
10969+
{
1090010970
"source_path_from_root": "/articles/active-directory/cloud-infrastructure-entitlement-management/permissions-management-trial-playbook.md",
1090110971
"redirect_url": "/azure/active-directory/cloud-infrastructure-entitlement-management/permissions-management-trial-user-guide",
1090210972
"redirect_document_id": false

0 commit comments

Comments
 (0)