Skip to content

Commit cf034de

Browse files
AbbyMSFTAbbyMSFT
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into alert-rule-v2-mitigations
2 parents f4f0203 + 4478786 commit cf034de

File tree

1,088 files changed

+28229
-18976
lines changed

Some content is hidden

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

1,088 files changed

+28229
-18976
lines changed

‎.openpublishing.publish.config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -831,7 +831,7 @@
831831
".openpublishing.redirection.json",
832832
".openpublishing.redirection.active-directory.json",
833833
".openpublishing.redirection.azure-sql.json",
834-
".openpublishing.redirection.data-factory.json",
834+
"articles/data-factory/.openpublishing.redirection.data-factory.json",
835835
".openpublishing.redirection.defender-for-cloud.json",
836836
".openpublishing.redirection.defender-for-iot.json",
837837
".openpublishing.redirection.healthcare-apis.json",

‎.openpublishing.redirection.active-directory.json

Lines changed: 29 additions & 119 deletions
Original file line numberDiff line numberDiff line change
@@ -357,8 +357,8 @@
357357
},
358358
{
359359
"source_path_from_root": "/articles/active-directory/conditional-access-azure-management.md",
360-
"redirect_url": "/azure/role-based-access-control/conditional-access-azure-management",
361-
"redirect_document_id": true
360+
"redirect_url": "/azure/active-directory/conditional-access/concept-conditional-access-cloud-apps",
361+
"redirect_document_id": false
362362
},
363363
{
364364
"source_path_from_root": "/articles/active-directory/role-based-access-control-custom-roles.md",
@@ -740,111 +740,6 @@
740740
"redirect_url": "/visualstudio/azure/vs-active-directory-webapi-what-happened",
741741
"redirect_document_id": false
742742
},
743-
{
744-
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-javascript-auth-code-angular.md",
745-
"redirect_url": "/azure/active-directory/develop/single-page-app-quickstart?pivots=devlang-angular",
746-
"redirect_document_id": false
747-
},
748-
{
749-
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-javascript-auth-code.md",
750-
"redirect_url": "/azure/active-directory/develop/single-page-app-quickstart?pivots=devlang-javascript",
751-
"redirect_document_id": false
752-
},
753-
{
754-
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-javascript-auth-code-react.md",
755-
"redirect_url": "/azure/active-directory/develop/single-page-app-quickstart?pivots=devlang-react",
756-
"redirect_document_id": false
757-
},
758-
{
759-
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-aspnet-webapp.md",
760-
"redirect_url": "/azure/active-directory/develop/web-app-quickstart?pivots=devlang-aspnet",
761-
"redirect_document_id": false
762-
},
763-
{
764-
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-aspnet-core-webapp.md",
765-
"redirect_url": "/azure/active-directory/develop/web-app-quickstart?pivots=devlang-aspnet-core",
766-
"redirect_document_id": false
767-
},
768-
{
769-
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-aspnet-core-webapp-calls-graph.md",
770-
"redirect_url": "/azure/active-directory/develop/web-app-quickstart?pivots=devlang-aspnet-core",
771-
"redirect_document_id": false
772-
},
773-
{
774-
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-nodejs-webapp-msal.md",
775-
"redirect_url": "/azure/active-directory/develop/web-app-quickstart?pivots=devlang-nodejs-msal",
776-
"redirect_document_id": false
777-
},
778-
{
779-
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-nodejs-webapp.md",
780-
"redirect_url": "/azure/active-directory/develop/web-app-quickstart?pivots=devlang-nodejs-passport",
781-
"redirect_document_id": false
782-
},
783-
{
784-
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-java-webapp.md",
785-
"redirect_url": "/azure/active-directory/develop/web-app-quickstart?pivots=devlang-java",
786-
"redirect_document_id": false
787-
},
788-
{
789-
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-python-webapp.md",
790-
"redirect_url": "/azure/active-directory/develop/web-app-quickstart?pivots=devlang-python",
791-
"redirect_document_id": false
792-
},
793-
{
794-
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-dotnet-native-aspnet.md",
795-
"redirect_url": "/azure/active-directory/develop/web-api-quickstart?pivots=devlang-aspnet",
796-
"redirect_document_id": false
797-
},
798-
{
799-
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-aspnet-core-web-api.md",
800-
"redirect_url": "/azure/active-directory/develop/web-api-quickstart?pivots=devlang-aspnet-core",
801-
"redirect_document_id": false
802-
},
803-
{
804-
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-android.md",
805-
"redirect_url": "/azure/active-directory/develop/mobile-app-quickstart?pivots=devlang-android",
806-
"redirect_document_id": false
807-
},
808-
{
809-
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-ios.md",
810-
"redirect_url": "/azure/active-directory/develop/mobile-app-quickstart?pivots=devlang-ios",
811-
"redirect_document_id": false
812-
},
813-
{
814-
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-uwp.md",
815-
"redirect_url": "/azure/active-directory/develop/desktop-app-quickstart?pivots=devlang-uwp",
816-
"redirect_document_id": false
817-
},
818-
{
819-
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-windows-desktop.md",
820-
"redirect_url": "/azure/active-directory/develop/desktop-app-quickstart?pivots=devlang-windows-desktop",
821-
"redirect_document_id": false
822-
},
823-
{
824-
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-nodejs-desktop.md",
825-
"redirect_url": "/azure/active-directory/develop/desktop-app-quickstart?pivots=devlang-nodejs-electron",
826-
"redirect_document_id": false
827-
},
828-
{
829-
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-netcore-daemon.md",
830-
"redirect_url": "/azure/active-directory/develop/console-app-quickstart?pivots=devlang-dotnet-core",
831-
"redirect_document_id": false
832-
},
833-
{
834-
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-python-daemon.md",
835-
"redirect_url": "/azure/active-directory/develop/console-app-quickstart?pivots=devlang-python",
836-
"redirect_document_id": false
837-
},
838-
{
839-
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-nodejs-console.md",
840-
"redirect_url": "/azure/active-directory/develop/console-app-quickstart?pivots=devlang-nodejs",
841-
"redirect_document_id": false
842-
},
843-
{
844-
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-java-daemon.md",
845-
"redirect_url": "/azure/active-directory/develop/console-app-quickstart?pivots=devlang-java",
846-
"redirect_document_id": false
847-
},
848743
{
849744
"source_path_from_root": "/articles/active-directory/active-directory-application-proxy-connectors.md",
850745
"redirect_url": "/azure/active-directory/active-directory-application-proxy-connectors-azure-portal",
@@ -860,14 +755,29 @@
860755
"redirect_url": "/azure/active-directory/active-directory-b2b-admin-add-users",
861756
"redirect_document_id": false
862757
},
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+
},
863773
{
864774
"source_path_from_root": "/articles/active-directory/external-identities/add-guest-to-role.md",
865775
"redirect_url": "/azure/active-directory/external-identities/add-users-administrator",
866776
"redirect_document_id": false
867777
},
868778
{
869779
"source_path_from_root": "/articles/active-directory/active-directory-b2b-compare-external-identities.md",
870-
"redirect_url": "/azure/active-directory/active-directory-b2b-compare-b2c",
780+
"redirect_url": "/azure/active-directory/external-identities/external-identities-overview",
871781
"redirect_document_id": false
872782
},
873783
{
@@ -1932,13 +1842,13 @@
19321842
},
19331843
{
19341844
"source_path_from_root": "/articles/active-directory/active-directory-b2b-compare-b2c.md",
1935-
"redirect_url": "/azure/active-directory/b2b/compare-with-b2c",
1936-
"redirect_document_id": true
1845+
"redirect_url": "/azure/active-directory/external-identities/external-identities-overview",
1846+
"redirect_document_id": false
19371847
},
19381848
{
19391849
"source_path_from_root": "/articles/active-directory/active-directory-b2b-mfa-instructions.md",
19401850
"redirect_url": "/azure/active-directory/b2b/conditional-access",
1941-
"redirect_document_id": true
1851+
"redirect_document_id": false
19421852
},
19431853
{
19441854
"source_path_from_root": "/articles/active-directory/active-directory-b2b-configure-saas-apps.md",
@@ -1957,8 +1867,8 @@
19571867
},
19581868
{
19591869
"source_path_from_root": "/articles/active-directory/active-directory-b2b-delegate-invitations.md",
1960-
"redirect_url": "/azure/active-directory/b2b/delegate-invitations",
1961-
"redirect_document_id": true
1870+
"redirect_url": "/azure/active-directory/external-identities/external-collaboration-settings-configure",
1871+
"redirect_document_id": false
19621872
},
19631873
{
19641874
"source_path_from_root": "/articles/active-directory/active-directory-b2b-faq.md",
@@ -3927,13 +3837,13 @@
39273837
},
39283838
{
39293839
"source_path_from_root": "/articles/active-directory/b2b/compare-with-b2c.md",
3930-
"redirect_url": "/azure/active-directory/external-identities/compare-with-b2c",
3931-
"redirect_document_id": true
3840+
"redirect_url": "/azure/active-directory/external-identities/external-identities-overview",
3841+
"redirect_document_id": false
39323842
},
39333843
{
39343844
"source_path_from_root": "/articles/active-directory/b2b/conditional-access.md",
3935-
"redirect_url": "/azure/active-directory/external-identities/conditional-access",
3936-
"redirect_document_id": true
3845+
"redirect_url": "/azure/active-directory/external-identities/authentication-conditional-access",
3846+
"redirect_document_id": false
39373847
},
39383848
{
39393849
"source_path_from_root": "/articles/active-directory/b2b/configure-saas-apps.md",
@@ -3952,8 +3862,8 @@
39523862
},
39533863
{
39543864
"source_path_from_root": "/articles/active-directory/b2b/delegate-invitations.md",
3955-
"redirect_url": "/azure/active-directory/external-identities/delegate-invitations",
3956-
"redirect_document_id": true
3865+
"redirect_url": "/azure/active-directory/external-identities/external-collaboration-settings-configure",
3866+
"redirect_document_id": false
39573867
},
39583868
{
39593869
"source_path_from_root": "/articles/active-directory/b2b/direct-federation.md",

‎.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.defender-for-iot.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -554,6 +554,16 @@
554554
"source_path_from_root": "/articles/defender-for-iot/device-builders/architecture-agent-based.md",
555555
"redirect_url": "/azure/defender-for-iot/device-builders/overview",
556556
"redirect_document_id": false
557+
},
558+
{
559+
"source_path_from_root": "/articles/defender-for-iot/organizations/references-horizon-api.md",
560+
"redirect_url": "/azure/defender-for-iot/organizations",
561+
"redirect_document_id": false
562+
},
563+
{
564+
"source_path_from_root": "/articles/defender-for-iot/organizations/references-horizon-sdk.md",
565+
"redirect_url": "/azure/defender-for-iot/organizations",
566+
"redirect_document_id": false
557567
}
558568
]
559569
}

0 commit comments

Comments
 (0)