Merge pull request #187648 from MicrosoftDocs/master

Merge master to live, 4 AM

Author: ttorble

.openpublishing.redirection.active-directory.json

@@ -357,8 +357,8 @@
         },
         {
             "source_path_from_root": "/articles/active-directory/conditional-access-azure-management.md",
-            "redirect_url": "/azure/role-based-access-control/conditional-access-azure-management",
-            "redirect_document_id": true
+            "redirect_url": "/azure/active-directory/conditional-access/concept-conditional-access-cloud-apps",
+            "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/active-directory/role-based-access-control-custom-roles.md",

.openpublishing.redirection.defender-for-iot.json

@@ -554,6 +554,16 @@
             "source_path_from_root": "/articles/defender-for-iot/device-builders/architecture-agent-based.md",
             "redirect_url": "/azure/defender-for-iot/device-builders/overview",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/references-horizon-api.md",
+            "redirect_url": "/azure/defender-for-iot/organizations",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/references-horizon-sdk.md",
+            "redirect_url": "/azure/defender-for-iot/organizations",
+            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.json

@@ -22357,6 +22357,11 @@
       "redirect_url": "/azure/role-based-access-control/role-assignments-portal",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/role-based-access-control/conditional-access-azure-management.md",
+      "redirect_url": "/azure/active-directory/conditional-access/concept-conditional-access-cloud-apps",
+      "redirect_document_id": true
+    },
     {
       "source_path_from_root": "/articles/scheduler/get-started-portal.md",
       "redirect_url": "/azure/scheduler/migrate-from-scheduler-to-logic-apps",
@@ -29337,6 +29342,11 @@
       "redirect_url": "/azure-stack/operator/azure-stack-compute-add-scalesets",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/virtual-machine-scale-sets/scripts/cli-sample-manage-scale-set.md",
+      "redirect_url": "/azure/virtual-machine-scale-sets/scripts/cli-sample-attach-disks",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/azure-stack/azure-stack-connected-deployment.md",
       "redirect_url": "/azure-stack/operator/azure-stack-connected-deployment",

articles/active-directory/fundamentals/5-secure-access-b2b.md

@@ -127,7 +127,7 @@ We recommend the following restrictions for guest users.
 
 * **Block access to the Azure portal. You can make rare necessary exceptions**. 
 
-   * Create a Conditional Access policy that includes either All guest and external users and then [implement a policy to block access](../../role-based-access-control/conditional-access-azure-management.md).
+   * Create a Conditional Access policy that includes either All guest and external users and then [implement a policy to block access](../conditional-access/concept-conditional-access-cloud-apps.md).
 
 
 

articles/active-directory/fundamentals/active-directory-access-create-new-tenant.md

@@ -83,6 +83,6 @@ If you're not going to continue to use this application, you can delete the tena
 
 - Add groups and members, see [Create a basic group and add members](active-directory-groups-create-azure-portal.md)
 
-- Learn about [role-based access using Privileged Identity Management](../../role-based-access-control/best-practices.md) and [Conditional Access](../../role-based-access-control/conditional-access-azure-management.md) to help manage your organization's application and resource access.
+- Learn about [Azure role-based access control (Azure RBAC)](../../role-based-access-control/overview.md) and [Conditional Access](../conditional-access/overview.md) to help manage your organization's application and resource access.
 
 - Learn about Azure AD, including [basic licensing information, terminology, and associated features](active-directory-whatis.md).

articles/active-directory/fundamentals/protect-m365-from-on-premises-attacks.md

@@ -129,7 +129,7 @@ We recommend the following provisioning methods:
 
    * Limit guest access to browsing groups and other properties in the directory. Use the external collaboration settings to restrict guests' ability to read groups they're not members of. 
 
-    * Block access to the Azure portal. You can make rare necessary exceptions.  Create a Conditional Access policy that includes all guests and external users. Then [implement a policy to block access](../../role-based-access-control/conditional-access-azure-management.md). 
+    * Block access to the Azure portal. You can make rare necessary exceptions.  Create a Conditional Access policy that includes all guests and external users. Then [implement a policy to block access](../conditional-access/concept-conditional-access-cloud-apps.md). 
 
 * **Disconnected forests**: Use [Azure AD cloud provisioning](../cloud-sync/what-is-cloud-sync.md). This method enables you to connect to disconnected forests, eliminating the need to establish cross-forest connectivity or trusts, which can broaden the effect of an on-premises breach.
 

articles/active-directory/manage-apps/f5-aad-integration.md

@@ -164,6 +164,8 @@ Refer to the following guided configuration tutorials using Easy Button template
 
 - [F5 BIG-IP Easy Button for SSO to header-based and LDAP applications](f5-big-ip-ldap-header-easybutton.md)
 
+- [F5 BIG-IP Easy Button for SSO to Oracle EBS (Enterprise Business Suite)](f5-big-ip-oracle-enterprise-business-suite-easy-button.md) 
+
 ## Additional resources
 
 - [The end of passwords, go passwordless](https://www.microsoft.com/security/business/identity/passwordless)