Skip to content

Commit 7b50b8d

Browse files
ProbablePrimeProbablePrime
authored
Merge branch 'master' into rifox/skd-options-reorder
2 parents 4cc6cd0 + 1d00909 commit 7b50b8d

File tree

3,580 files changed

+107133
-42845
lines changed

Some content is hidden

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

3,580 files changed

+107133
-42845
lines changed

‎.openpublishing.publish.config.json

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -788,7 +788,25 @@
788788
"url": "https://github.com/Azure/azure-docs-bicep-samples/",
789789
"branch": "main",
790790
"branch_mapping": {}
791-
}
791+
},
792+
{
793+
"path_to_root": "msdocs-python-flask-webapp-quickstart",
794+
"url": "https://github.com/Azure-Samples/msdocs-python-flask-webapp-quickstart",
795+
"branch": "main",
796+
"branch_mapping": {}
797+
},
798+
{
799+
"path_to_root": "msdocs-python-django-webapp-quickstart",
800+
"url": "https://github.com/Azure-Samples/msdocs-python-django-webapp-quickstart",
801+
"branch": "main",
802+
"branch_mapping": {}
803+
},
804+
{
805+
"path_to_root": "msdocs-nodejs-mongodb-azure-sample-app",
806+
"url": "https://github.com/Azure-Samples/msdocs-nodejs-mongodb-azure-sample-app",
807+
"branch": "main",
808+
"branch_mapping": {}
809+
}
792810
],
793811
"branch_target_mapping": {
794812
"live": [
@@ -813,7 +831,7 @@
813831
".openpublishing.redirection.json",
814832
".openpublishing.redirection.active-directory.json",
815833
".openpublishing.redirection.azure-sql.json",
816-
".openpublishing.redirection.data-factory.json",
834+
"articles/data-factory/.openpublishing.redirection.data-factory.json",
817835
".openpublishing.redirection.defender-for-cloud.json",
818836
".openpublishing.redirection.defender-for-iot.json",
819837
".openpublishing.redirection.healthcare-apis.json",

‎.openpublishing.redirection.active-directory.json

Lines changed: 54 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
},
3333
{
3434
"source_path_from_root": "/articles/active-directory/develop/registration-config-multi-tenant-application-add-to-gallery-how-to.md",
35-
"redirect_url": "/azure/active-directory/develop/v2-howto-app-gallery-listing",
35+
"redirect_url": "/azure/active-directory/manage-apps/v2-howto-app-gallery-listing",
3636
"redirect_document_id": false
3737
},
3838
{
@@ -755,14 +755,29 @@
755755
"redirect_url": "/azure/active-directory/active-directory-b2b-admin-add-users",
756756
"redirect_document_id": false
757757
},
758+
{
759+
"source_path_from_root": "/articles/active-directory/external-identities/delegate-invitations.md",
760+
"redirect_url": "/azure/active-directory/external-identities/external-collaboration-settings-configure",
761+
"redirect_document_id": true
762+
},
763+
{
764+
"source_path_from_root": "/articles/active-directory/external-identities/conditional-access.md",
765+
"redirect_url": "/azure/active-directory/external-identities/authentication-conditional-access",
766+
"redirect_document_id": true
767+
},
768+
{
769+
"source_path_from_root": "/articles/active-directory/external-identities/compare-with-b2c.md",
770+
"redirect_url": "/azure/active-directory/external-identities/external-identities-overview",
771+
"redirect_document_id": true
772+
},
758773
{
759774
"source_path_from_root": "/articles/active-directory/external-identities/add-guest-to-role.md",
760775
"redirect_url": "/azure/active-directory/external-identities/add-users-administrator",
761776
"redirect_document_id": false
762777
},
763778
{
764779
"source_path_from_root": "/articles/active-directory/active-directory-b2b-compare-external-identities.md",
765-
"redirect_url": "/azure/active-directory/active-directory-b2b-compare-b2c",
780+
"redirect_url": "/azure/active-directory/external-identities/external-identities-overview",
766781
"redirect_document_id": false
767782
},
768783
{
@@ -1827,13 +1842,13 @@
18271842
},
18281843
{
18291844
"source_path_from_root": "/articles/active-directory/active-directory-b2b-compare-b2c.md",
1830-
"redirect_url": "/azure/active-directory/b2b/compare-with-b2c",
1831-
"redirect_document_id": true
1845+
"redirect_url": "/azure/active-directory/external-identities/external-identities-overview",
1846+
"redirect_document_id": false
18321847
},
18331848
{
18341849
"source_path_from_root": "/articles/active-directory/active-directory-b2b-mfa-instructions.md",
18351850
"redirect_url": "/azure/active-directory/b2b/conditional-access",
1836-
"redirect_document_id": true
1851+
"redirect_document_id": false
18371852
},
18381853
{
18391854
"source_path_from_root": "/articles/active-directory/active-directory-b2b-configure-saas-apps.md",
@@ -1852,8 +1867,8 @@
18521867
},
18531868
{
18541869
"source_path_from_root": "/articles/active-directory/active-directory-b2b-delegate-invitations.md",
1855-
"redirect_url": "/azure/active-directory/b2b/delegate-invitations",
1856-
"redirect_document_id": true
1870+
"redirect_url": "/azure/active-directory/external-identities/external-collaboration-settings-configure",
1871+
"redirect_document_id": false
18571872
},
18581873
{
18591874
"source_path_from_root": "/articles/active-directory/active-directory-b2b-faq.md",
@@ -3170,34 +3185,39 @@
31703185
"redirect_url": "/azure/active-directory/develop/v2-conditional-access-dev-guide",
31713186
"redirect_document_id": false
31723187
},
3188+
{
3189+
"source_path_from_root": "/articles/active-directory/develop/v2-howto-app-gallery-listing.md",
3190+
"redirect_url": "/azure/active-directory/manage-apps/v2-howto-app-gallery-listing",
3191+
"redirect_document_id": false
3192+
},
31733193
{
31743194
"source_path_from_root": "/articles/active-directory/azuread-dev/howto-app-gallery-listing.md",
3175-
"redirect_url": "/azure/active-directory/develop/v2-howto-app-gallery-listing",
3195+
"redirect_url": "/azure/active-directory/manage-apps/v2-howto-app-gallery-listing",
31763196
"redirect_document_id": false
31773197
},
31783198
{
31793199
"source_path_from_root": "/articles/active-directory/develop/howto-app-gallery-listing.md",
3180-
"redirect_url": "/azure/active-directory/develop/v2-howto-app-gallery-listing",
3200+
"redirect_url": "/azure/active-directory/manage-apps/v2-howto-app-gallery-listing",
31813201
"redirect_document_id": false
31823202
},
31833203
{
31843204
"source_path_from_root": "/articles/active-directory/manage-apps/isv-choose-multi-tenant-federation.md",
3185-
"redirect_url": "/azure/active-directory/develop/v2-howto-app-gallery-listing",
3205+
"redirect_url": "/azure/active-directory/manage-apps/v2-howto-app-gallery-listing",
31863206
"redirect_document_id": false
31873207
},
31883208
{
31893209
"source_path_from_root": "/articles/active-directory/manage-apps/isv-create-sso-documentation.md",
3190-
"redirect_url": "/azure/active-directory/develop/v2-howto-app-gallery-listing",
3210+
"redirect_url": "/azure/active-directory/manage-apps/v2-howto-app-gallery-listing",
31913211
"redirect_document_id": false
31923212
},
31933213
{
31943214
"source_path_from_root": "/articles/active-directory/manage-apps/isv-sso-content.md",
3195-
"redirect_url": "/azure/active-directory/develop/v2-howto-app-gallery-listing",
3215+
"redirect_url": "/azure/active-directory/manage-apps/v2-howto-app-gallery-listing",
31963216
"redirect_document_id": false
31973217
},
31983218
{
31993219
"source_path_from_root": "/articles/active-directory/manage-apps/isv-tenant-multi-tenant-app.md",
3200-
"redirect_url": "/azure/active-directory/develop/v2-howto-app-gallery-listing",
3220+
"redirect_url": "/azure/active-directory/manage-apps/v2-howto-app-gallery-listing",
32013221
"redirect_document_id": false
32023222
},
32033223
{
@@ -3817,13 +3837,13 @@
38173837
},
38183838
{
38193839
"source_path_from_root": "/articles/active-directory/b2b/compare-with-b2c.md",
3820-
"redirect_url": "/azure/active-directory/external-identities/compare-with-b2c",
3821-
"redirect_document_id": true
3840+
"redirect_url": "/azure/active-directory/external-identities/external-identities-overview",
3841+
"redirect_document_id": false
38223842
},
38233843
{
38243844
"source_path_from_root": "/articles/active-directory/b2b/conditional-access.md",
3825-
"redirect_url": "/azure/active-directory/external-identities/conditional-access",
3826-
"redirect_document_id": true
3845+
"redirect_url": "/azure/active-directory/external-identities/authentication-conditional-access",
3846+
"redirect_document_id": false
38273847
},
38283848
{
38293849
"source_path_from_root": "/articles/active-directory/b2b/configure-saas-apps.md",
@@ -3842,8 +3862,8 @@
38423862
},
38433863
{
38443864
"source_path_from_root": "/articles/active-directory/b2b/delegate-invitations.md",
3845-
"redirect_url": "/azure/active-directory/external-identities/delegate-invitations",
3846-
"redirect_document_id": true
3865+
"redirect_url": "/azure/active-directory/external-identities/external-collaboration-settings-configure",
3866+
"redirect_document_id": false
38473867
},
38483868
{
38493869
"source_path_from_root": "/articles/active-directory/b2b/direct-federation.md",
@@ -7080,6 +7100,21 @@
70807100
"redirect_url": "/azure/active-directory/reports-monitoring/overview-reports",
70817101
"redirect_document_id": false
70827102
},
7103+
{
7104+
"source_path_from_root": "/articles/active-directory/hybrid/how-to-connect-fed-hybrid-azure-ad-join-post-config-tasks.md",
7105+
"redirect_url": "/azure/active-directory/devices/howto-hybrid-azure-ad-join",
7106+
"redirect_document_id": true
7107+
},
7108+
{
7109+
"source_path_from_root": "/articles/active-directory/devices/hybrid-azuread-join-federated-domains.md",
7110+
"redirect_url": "/azure/active-directory/devices/howto-hybrid-azure-ad-join",
7111+
"redirect_document_id": false
7112+
},
7113+
{
7114+
"source_path_from_root": "/articles/active-directory/devices/hybrid-azuread-join-managed-domains.md",
7115+
"redirect_url": "/azure/active-directory/devices/howto-hybrid-azure-ad-join",
7116+
"redirect_document_id": false
7117+
},
70837118
{
70847119
"source_path_from_root": "/articles/active-directory/reporting-azure-monitor-diagnostics-azure-storage-account.md",
70857120
"redirect_url": "/azure/active-directory/reports-monitoring/quickstart-azure-monitor-route-logs-to-storage-account",

‎.openpublishing.redirection.azure-productivity.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,31 @@
44
"source_path_from_root": "/articles/lab-services/classroom-labs-overview.md",
55
"redirect_url": "/azure/lab-services/get-started-manage-labs",
66
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/devtest-labs/scripts/add-external-user-to-lab.md",
10+
"redirect_url": "/azure/devtest-labs/samples-powershell",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/devtest-labs/scripts/add-marketplace-images-to-lab.md",
15+
"redirect_url": "/azure/devtest-labs/samples-powershell",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/articles/devtest-labs/scripts/create-custom-image-from-vhd.md",
20+
"redirect_url": "/azure/devtest-labs/samples-powershell",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path_from_root": "/articles/devtest-labs/scripts/create-custom-role-in-lab.md",
25+
"redirect_url": "/azure/devtest-labs/samples-powershell",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path_from_root": "/articles/devtest-labs/scripts/set-allowed-vm-sizes-in-lab.md",
30+
"redirect_url": "/azure/devtest-labs/samples-powershell",
31+
"redirect_document_id": false
732
}
833
]
934
}

‎.openpublishing.redirection.azure-sql.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,11 @@
179179
"source_path_from_root": "/articles/azure-sql/database/job-automation-managed-instances.md",
180180
"redirect_url": "/azure/azure-sql/managed-instance/job-automation-managed-instance",
181181
"redirect_document_id": true
182-
}
182+
},
183+
{
184+
"source_path": "articles/azure-sql/database/service-tiers-general-purpose-business-critical.md",
185+
"redirect_url": "/azure/azure-sql/database/service-tiers-vcore",
186+
"redirect_document_id": false
187+
}
183188
]
184189
}

‎.openpublishing.redirection.data-factory.json

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

‎.openpublishing.redirection.healthcare-apis.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@
374374
},
375375
{
376376
"source_path_from_root": "/articles/healthcare-apis/data-transformation/move-to-synapse.md",
377-
"redirect_url": "/azure/healthcare-apis/fhir/move-to-synapse",
377+
"redirect_url": "/azure/healthcare-apis/fhir/copy-to-synapse",
378378
"redirect_document_id": true
379379
},
380380
{
@@ -429,7 +429,7 @@
429429
},
430430
{
431431
"source_path_from_root": "/articles/healthcare-apis/azure-api-for-fhir/access-fhir-postman-tutorial.md",
432-
"redirect_url": "/azure/healthcare-apis/use-postman",
432+
"redirect_url": "/azure/healthcare-apis/fhir/use-postman",
433433
"redirect_document_id": true
434434
},
435435
{

0 commit comments

Comments
 (0)