Merge pull request #48305 from MicrosoftDocs/master

8/6 AM Publish

Author: huypub

.openpublishing.redirection.json

@@ -10170,6 +10170,11 @@
             "redirect_url": "/azure/mysql/reference-data-in-stored-procedures",
             "redirect_document_id": false
         },
+        {
+            "source_path": "articles/search/search-video-demo-tutorial-list.md",
+            "redirect_url": "https://azure.microsoft.com/resources/videos/index/?services=search",
+            "redirect_document_id": false
+        },
         {
             "source_path": "articles/search/search-get-started-management-api.md",
             "redirect_url": "https://docs.microsoft.com/rest/api/searchmanagement/",
@@ -11605,6 +11610,11 @@
             "redirect_url": "/azure/traffic-manager/traffic-manager-configure-priority-routing-method",
             "redirect_document_id": false
         },
+        {
+            "source_path": "articles/traffic-manager/traffic-manager-create-profile.md",
+            "redirect_url": "/azure/traffic-manager/quickstart-create-traffic-manager-profile",
+            "redirect_document_id": false
+        },
         {
             "source_path": "articles/traffic-manager/traffic-manager-endpoints.md",
             "redirect_url": "/azure/traffic-manager/traffic-manager-manage-endpoints",
@@ -21814,6 +21824,113 @@
             "source_path": "articles/marketplace-publishing/marketplace-publishing-support-common-issues.md",
             "redirect_url": "https://cloudpartner.azure.com",
             "redirect_document_id": false
+        },
+         {
+	    "source_path": "articles/marketplace-publishing/marketplace-publishing-vm-image-creation-troubleshooting.md",
+            "redirect_url": "/azure/marketplace/",
+            "redirect_document_id": false
+        },
+        {
+
+            "source_path": "articles/marketplace-publishing/marketplace-publishing-vm-image-post-publishing.md",
+            "redirect_url": "/azure/marketplace/",
+            "redirect_document_id": false
+        },
+        {
+
+            "source_path": "articles/marketplace-publishing/marketplace-publishing-portals.md",
+            "redirect_url": "/azure/marketplace/",
+            "redirect_document_id": false
+        },
+        {
+
+            "source_path": "articles/marketplace-publishing/index.md",
+            "redirect_url": "/azure/marketplace/",
+            "redirect_document_id": false
+        },
+        {
+
+            "source_path": "articles/marketplace-publishing/marketplace-publishing-solution-template-creation.md",
+            "redirect_url": "/azure/marketplace/",
+            "redirect_document_id": false
+        },
+        {
+
+            "source_path": "articles/marketplace-publishing/marketplace-publishing-push-to-production.md",
+            "redirect_url": "/azure/marketplace/",
+            "redirect_document_id": false
+        },
+        {
+
+            "source_path": "articles/marketplace-publishing/marketplace-publishing-azure-certification.md",
+            "redirect_url": "/azure/marketplace/",
+            "redirect_document_id": false
+        },
+        {
+
+            "source_path": "articles/marketplace-publishing/marketplace-publishing-pre-requisites.md",
+            "redirect_url": "/azure/marketplace/",
+            "redirect_document_id": false
+        },
+        {
+
+            "source_path": "articles/marketplace-publishing/marketplace-publishing-solution-template-test-in-staging.md",
+            "redirect_url": "/azure/marketplace/",
+            "redirect_document_id": false
+        },
+        {
+
+            "source_path": "articles/marketplace-publishing/marketplace-publishing-accounts-creation-registration.md",
+            "redirect_url": "/azure/marketplace/",
+            "redirect_document_id": false
+        },
+        {
+
+            "source_path": "articles/marketplace-publishing/marketplace-publishing-getting-started.md",
+            "redirect_url": "/azure/marketplace/",
+            "redirect_document_id": false
+        },
+        {
+
+            "source_path": "articles/marketplace-publishing/marketplace-publishing-solution-template-creation-prerequisites.md",
+            "redirect_url": "/azure/marketplace/",
+            "redirect_document_id": false
+        },
+        {
+
+            "source_path": "articles/marketplace-publishing/marketplace-publishing-vm-image-creation-on-premise.md",
+            "redirect_url": "/azure/marketplace/",
+            "redirect_document_id": false
+        },
+        {
+
+            "source_path": "articles/marketplace-publishing/marketplace-publishing-vm-image-creation-prerequisites.md",
+            "redirect_url": "/azure/marketplace/",
+            "redirect_document_id": false
+        },
+        {
+
+            "source_path": "articles/marketplace-publishing/marketplace-publishing-vm-image-creation.md",
+            "redirect_url": "/azure/marketplace/",
+            "redirect_document_id": false
+        },
+        {
+
+            "source_path": "articles/marketplace-publishing/marketplace-publishing-powershell-setup.md",
+            "redirect_url": "/azure/marketplace/",
+            "redirect_document_id": false
+        },
+        {
+
+            "source_path": "articles/marketplace-publishing/marketplace-publishing-vm-image-test-in-staging.md",
+            "redirect_url": "/azure/marketplace/",
+            "redirect_document_id": false
+        },
+        {
+
+            "source_path": "articles/marketplace-publishing/marketplace-publishing-push-to-staging.md",
+            "redirect_url": "/azure/marketplace/",
+            "redirect_document_id": false
         },
         {
             "source_path": "articles/marketplace/grow-your-business-azure-marketplace.md",
@@ -26591,43 +26708,43 @@
             "redirect_document_id": true
         },
         {
-            "source_path": "articles/powerbi-embedded/create-capacity.md",
+            "source_path": "articles/power-bi-embedded/create-capacity.md",
             "redirect_url": "https://docs.microsoft.com/power-bi/developer/azure-pbie-create-capacity",
             "redirect_document_id": true
         },
         {
-            "source_path": "articles/powerbi-embedded/get-started.md",
+            "source_path": "articles/power-bi-embedded/get-started.md",
             "redirect_url": "https://docs.microsoft.com/power-bi/developer/embedding",
             "redirect_document_id": true
         },
         {
-            "source_path": "articles/powerbi-embedded/pause-start.md",
+            "source_path": "articles/power-bi-embedded/pause-start.md",
             "redirect_url": "https://docs.microsoft.com/power-bi/developer/azure-pbie-pause-start",
             "redirect_document_id": true
         },
         {
-            "source_path": "articles/powerbi-embedded/scale-capacity.md",
+            "source_path": "articles/power-bi-embedded/scale-capacity.md",
             "redirect_url": "https://docs.microsoft.com/power-bi/developer/azure-pbie-scale-capacity",
             "redirect_document_id": true
         },
         {
-            "source_path": "articles/powerbi-embedded/what-is-power-bi-embedded.md",
+            "source_path": "articles/power-bi-embedded/what-is-power-bi-embedded.md",
             "redirect_url": "https://docs.microsoft.com/power-bi/developer/azure-pbie-what-is-power-bi-embedded",
             "redirect_document_id": true
         },
         {
-            "source_path": "articles/powerbi-embedded/migrate-from-power-bi-workspace-collections.md",
-            "redirect_url": "https://docs.microsoft.com/en-us/power-bi/developer/migrate-from-powerbi-embedded",
+            "source_path": "articles/power-bi-embedded/migrate-from-power-bi-workspace-collections.md",
+            "redirect_url": "https://docs.microsoft.com/power-bi/developer/migrate-from-powerbi-embedded",
             "redirect_document_id": true
         },
         {
             "source_path": "articles/power-bi-embedded/migrate-tool.md",
-            "redirect_url": "https://docs.microsoft.com/en-us/power-bi/developer/migrate-tool",
+            "redirect_url": "https://docs.microsoft.com/power-bi/developer/migrate-tool",
             "redirect_document_id": true
         },
         {
-            "source_path": "articles/powerbi-embedded/migrate-code-snippets.md",
-            "redirect_url": "https://docs.microsoft.com/en-us/power-bi/developer/migrate-code-snippets",
+            "source_path": "articles/power-bi-embedded/migrate-code-snippets.md",
+            "redirect_url": "https://docs.microsoft.com/power-bi/developer/migrate-code-snippets",
             "redirect_document_id": true
         },
         {
@@ -26679,6 +26796,21 @@
             "source_path": "articles/active-directory/device-management-azuread-joined-devices-frx.md",
             "redirect_url": "/azure/active-directory/devices/azuread-joined-devices-frx",
             "redirect_document_id": true
+        },
+		{
+            "source_path": "articles/active-directory/active-directory-conditional-access-baseline-protection.md",
+            "redirect_url": "/azure/active-directory/conditional-access/baseline-protection",
+            "redirect_document_id": true
+        },
+		{
+            "source_path": "articles/active-directory/active-directory-conditional-access-locations.md",
+            "redirect_url": "/azure/active-directory/conditional-access/location-condition",
+            "redirect_document_id": true
+        },
+		{
+            "source_path": "articles/active-directory/active-directory-conditional-access-whatif.md",
+            "redirect_url": "/azure/active-directory/conditional-access/what-if-tool",
+            "redirect_document_id": true
         }
     ]
 }

articles/active-directory/TOC.md

@@ -171,12 +171,13 @@
 #### [Plan Azure AD join](devices/azureadjoin-plan.md)
 #### [Plan your hybrid Azure AD join implementation](devices/hybrid-azuread-join-plan.md)
 #### [Control the hybrid Azure AD join of your devices](devices/hybrid-azuread-join-control.md)
+#### [Assign local admins to Azure AD joined devices](devices/assign-local-admin.md)
 #### [Troubleshoot hybrid Azure AD joined Windows current devices](devices/troubleshoot-hybrid-join-windows-current.md)
 #### [Troubleshoot hybrid Azure AD joined legacy Windows devices](devices/troubleshoot-hybrid-join-windows-legacy.md)
 
 ### Concepts
-### [Manage devices using the Azure portal](devices/device-management-azure-portal.md)
-### [FAQs](devices/faq.md)
+#### [Manage devices using the Azure portal](devices/device-management-azure-portal.md)
+#### [FAQs](devices/faq.md)
 
 ## Manage apps
 ### [Overview](manage-apps/what-is-application-management.md)
@@ -403,20 +404,20 @@
 ### [Conditional access](active-directory-conditional-access-azure-portal.md)
 #### [Get started](active-directory-conditional-access-azure-portal-get-started.md)
 #### Quickstarts
-##### [Configure per cloud app MFA](active-directory-conditional-access-app-based-mfa.md)
-##### [Require terms of use to be accepted](active-directory-conditional-access-tou.md)
-##### [Block access when a session risk is detected](active-directory-conditional-access-app-sign-in-risk.md)
+##### [Configure per cloud app MFA](conditional-access/app-based-mfa.md)
+##### [Require terms of use to be accepted](conditional-access/require-tou.md)
+##### [Block access when a session risk is detected](conditional-access/app-sign-in-risk.md)
 #### Tutorials
 ##### [Migrate classic MFA policy](active-directory-conditional-access-migration-mfa.md)
 #### Concepts
-##### [Baseline Protection](active-directory-conditional-access-baseline-protection.md)
-##### [Conditions](active-directory-conditional-access-conditions.md)
-##### [Location conditions](active-directory-conditional-access-locations.md)
-##### [Controls](active-directory-conditional-access-controls.md)
-##### [What if tool](active-directory-conditional-access-whatif.md)
+##### [Baseline Protection](conditional-access/baseline-protection.md)
+##### [Conditions](conditional-access/conditions.md)
+##### [Location conditions](conditional-access/location-condition.md)
+##### [Controls](conditional-access/controls.md)
+##### [What if tool](conditional-access/what-if-tool.md)
 ##### [Understand device policies for Office 365 services](active-directory-conditional-access-device-policies.md)
 #### How-to guides
-##### [Best practices](active-directory-conditional-access-best-practices.md)
+##### [Best practices](conditional-access/best-practices.md)
 ##### [Configure conditional access policies for access attempts from untrusted networks](active-directory-conditional-access-untrusted-networks.md)
 ##### [Set up device-based conditional access](active-directory-conditional-access-policy-connected-applications.md)
 ##### [Set up app-based conditional access](active-directory-conditional-access-mam.md)