Merge pull request #188193 from MicrosoftDocs/main

Merge master to main, 4 AM

Author: v-ccolin

.openpublishing.publish.config.json

@@ -871,6 +871,7 @@
     "articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
     "articles/azure-video-analyzer/.openpublishing.redirection.azure-video-analyzer.json",
     "articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
+    "articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
     "articles/mysql/.openpublishing.redirection.mysql.json"
   ]
 }

.openpublishing.redirection.json

@@ -21984,11 +21984,6 @@
       "redirect_url": "/azure/monitoring-and-diagnostics/azure-diagnostics-schema",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/virtual-machine-scale-sets/virtual-machine-scale-sets-advanced-autoscale.md",
-      "redirect_url": "/azure/monitoring-and-diagnostics/insights-advanced-autoscale-virtual-machine-scale-sets",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/log-analytics/log-analytics-alerts-webhooks.md",
       "redirect_url": "/azure/monitoring-and-diagnostics/monitor-alerts-unified-log-webhook",
@@ -27769,161 +27764,11 @@
       "redirect_url": "/azure/virtual-desktop/troubleshoot-client",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/virtual-machine-scale-sets/virtual-machine-scale-sets-encrypt-disks-cli.md",
-      "redirect_url": "/azure/virtual-machine-scale-sets/disk-encryption-cli",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/virtual-machine-scale-sets/virtual-machine-scale-sets-encrypt-disks-ps.md",
-      "redirect_url": "/azure/virtual-machine-scale-sets/disk-encryption-powershell",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/virtual-machine-scale-sets/virtual-machine-scale-sets-overview.md",
-      "redirect_url": "/azure/virtual-machine-scale-sets/overview",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/virtual-machine-scale-sets/policy-samples.md",
-      "redirect_url": "/azure/virtual-machine-scale-sets/policy-reference",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/virtual-machine-scale-sets/virtual-machine-scale-sets-create-cli.md",
-      "redirect_url": "/azure/virtual-machine-scale-sets/quick-create-cli",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/virtual-machine-scale-sets/virtual-machine-scale-sets-create-portal.md",
-      "redirect_url": "/azure/virtual-machine-scale-sets/quick-create-portal",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/virtual-machine-scale-sets/virtual-machine-scale-sets-create-powershell.md",
-      "redirect_url": "/azure/virtual-machine-scale-sets/quick-create-powershell",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/virtual-machine-scale-sets/virtual-machine-scale-sets-create-template-linux.md",
-      "redirect_url": "/azure/virtual-machine-scale-sets/quick-create-template-linux",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/virtual-machine-scale-sets/virtual-machine-scale-sets-deploy-scaling-app-template.md",
-      "redirect_url": "/azure/virtual-machine-scale-sets/quick-create-template-linux",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/virtual-machine-scale-sets/virtual-machine-scale-sets-create-template-windows.md",
-      "redirect_url": "/azure/virtual-machine-scale-sets/quick-create-template-windows",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/virtual-machine-scale-sets/cli-samples.md",
-      "redirect_url": "/azure/virtual-machine-scale-sets/scripts/cli-sample-create-simple-scale-set",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/virtual-machine-scale-sets/powershell-samples.md",
-      "redirect_url": "/azure/virtual-machine-scale-sets/scripts/powershell-sample-create-simple-scale-set",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/virtual-machine-scale-sets/virtual-machine-scale-sets-security-attributes.md",
-      "redirect_url": "/azure/virtual-machine-scale-sets/security-baseline",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/virtual-machine-scale-sets/virtual-machine-scale-sets-security-controls.md",
-      "redirect_url": "/azure/virtual-machine-scale-sets/security-baseline",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/virtual-machine-scale-sets/virtual-machine-scale-sets-autoscale-cli.md",
-      "redirect_url": "/azure/virtual-machine-scale-sets/tutorial-autoscale-cli",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/virtual-machine-scale-sets/virtual-machine-scale-sets-autoscale-powershell.md",
-      "redirect_url": "/azure/virtual-machine-scale-sets/tutorial-autoscale-powershell",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/cloud-services-extended-support/cses-support-help.md",
       "redirect_url": "/azure/cloud-services-extended-support/support-help",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/virtual-machine-scale-sets/virtual-machine-scale-sets-managed-disks.md",
-      "redirect_url": "/azure/virtual-machine-scale-sets/tutorial-use-disks-cli",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/virtual-machine-scale-sets/virtual-machine-scale-sets-use-low-priority.md",
-      "redirect_url": "/azure/virtual-machine-scale-sets/use-spot",
-      "redirect_document_id": true
-    },
-    {
-      "source_path_from_root": "/articles/virtual-machine-scale-sets/virtual-machine-scale-sets-linux-autoscale.md",
-      "redirect_url": "/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-autoscale-cli",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/virtual-machine-scale-sets/virtual-machine-scale-sets-windows-autoscale.md",
-      "redirect_url": "/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-autoscale-powershell",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/virtual-machine-scale-sets/virtual-machine-scale-sets-cli-quick-create.md",
-      "redirect_url": "/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-create",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/virtual-machine-scale-sets/virtual-machine-scale-sets-cli-quick-create-cli-nodejs.md",
-      "redirect_url": "/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-create",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/virtual-machine-scale-sets/virtual-machine-scale-sets-linux-create-cli.md",
-      "redirect_url": "/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-create",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/virtual-machine-scale-sets/virtual-machine-scale-sets-linux-create-cli-nodejs.md",
-      "redirect_url": "/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-create",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/virtual-machine-scale-sets/virtual-machine-scale-sets-windows-create.md",
-      "redirect_url": "/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-create",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/virtual-machine-scale-sets/virtual-machine-scale-sets-create.md",
-      "redirect_url": "/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-create-cli",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/virtual-machine-scale-sets/virtual-machine-scale-sets-portal-create.md",
-      "redirect_url": "/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-create-portal",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/virtual-machine-scale-sets/virtual-machine-scale-sets-windows-manage.md",
-      "redirect_url": "/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-manage-powershell",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/virtual-machines/linux/vertical-scaling-automation.md",
-      "redirect_url": "/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-vertical-scale-reprovision",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/virtual-machines/windows/vertical-scaling-automation.md",
-      "redirect_url": "/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-vertical-scale-reprovision",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/virtual-network/virtual-network-create-vm-accelerated-networking.md",
       "redirect_url": "/azure/virtual-network/create-vm-accelerated-networking-cli",
@@ -28849,11 +28694,6 @@
       "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",
@@ -32634,11 +32474,6 @@
       "redirect_url": "/previous-versions/azure/virtual-machines/windows/sqlclassic/virtual-machines-windows-classic-sql-server-premium-storage",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/virtual-machine-scale-sets/orchestration-modes.md",
-      "redirect_url": "/previous-versions/azure/virtual-machine-scale-sets/orchestration-modes",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/virtual-network/create-virtual-network-classic.md",
       "redirect_url": "/previous-versions/azure/virtual-network/create-virtual-network-classic",

articles/active-directory/devices/concept-primary-refresh-token.md

@@ -76,6 +76,8 @@ A PRT is used by two key components in Windows:
 
 * **Azure AD CloudAP plugin**: During Windows sign in, the Azure AD CloudAP plugin requests a PRT from Azure AD using the credentials provided by the user. It also caches the PRT to enable cached sign in when the user does not have access to an internet connection.
 * **Azure AD WAM plugin**: When users try to access applications, the Azure AD WAM plugin uses the PRT to enable SSO on Windows 10. Azure AD WAM plugin uses the PRT to request refresh and access tokens for applications that rely on WAM for token requests. It also enables SSO on browsers by injecting the PRT into browser requests. Browser SSO in Windows 10 is supported on Microsoft Edge (natively), Chrome (via the [Windows 10 Accounts](https://chrome.google.com/webstore/detail/windows-10-accounts/ppnbnpeolgkicgegkbkbjmhlideopiji?hl=en) or [Office Online](https://chrome.google.com/webstore/detail/office/ndjpnladcallmjemlbaebfadecfhkepb?hl=en) extensions) or Mozilla Firefox v91+ (Firefox [Windows SSO setting](https://support.mozilla.org/kb/windows-sso))
+  > [!NOTE]
+  >  In instances where a user has two accounts from the same Azure AD tenant signed in to a browser application, the device authentication provided by the PRT of the primary account is automatically applied to the second account as well. As a result, the second account also satisfies any device-based Conditional Access policy on the tenant.
 
 ## How is a PRT renewed?
 

articles/active-directory/hybrid/plan-connect-topologies.md

@@ -151,13 +151,11 @@ This topology implements the following use cases:
 *	It is supported to have different sync scopes and different sync rules for different tenants.
 *	Only one Azure AD tenant sync can be configured to write back to Active Directory for the same object. This includes device and group writeback as well as Hybrid Exchange configurations – these features can only be configured in one tenant. The only exception here is Password Writeback – see below.
 *	It is supported to configure Password Hash Sync from Active Directory to multiple Azure AD tenants for the same user object. If Password Hash Sync is enabled for a tenant, then Password Writeback may be enabled as well, and this can be done on multiple tenants: if the password is changed on one tenant, then password writeback will update it in Active Directory, and Password Hash Sync will update the password in the other tenants.
-*	It is not supported to add and verify the same custom domain name in more than one Azure AD tenant, with one exception: it is supported to [add and verify](../fundamentals/add-custom-domain.md) a custom domain name in a tenant in the Azure Commercial environment and subsequently add and verify that same domain name in a tenant in the Azure Government environment. Note that the custom domain name **MUST** exist in Commercial Azure AD tenant before it can be verified in the Azure Government Azure AD tenant.
+*	It is not supported to add and verify the same custom domain name in more than one Azure AD tenant, even if these tenants are in different Azure environments.
 *	It is not supported to configure hybrid experiences such as Seamless SSO and Hybrid Azure AD Join on more than one tenant. Doing so would overwrite the configuration of the other tenant and would make it unusable. 
 *	You can synchronize device objects to more than one tenant but only one tenant can be configured to trust a device.
 * Each Azure AD Connect instance should be running on a domain-joined machine.
 
-Related information : [Federate multiple instances of Azure AD with single instance of AD FS](./how-to-connect-fed-single-adfs-multitenant-federation.md)
-
 >[!NOTE]
 >Global Address List Synchronization (GalSync) is not done automatically in this topology and requires an additional custom MIM implementation to ensure each tenant has a complete Global Address List (GAL) in Exchange Online and Skype for Business Online.