Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into subnet-prefixes

Author: asudbring

articles/cost-management-billing/savings-plan/scope-savings-plan.md

@@ -19,22 +19,21 @@ You have the following options to scope a savings plan, depending on your needs:
 
 ## Scope options
 
-- **Single resource group scope** - Applies the savings plan benefit to eligible resources in the selected resource group only.
-- **Single subscription scope** - Applies the savings plan benefit to eligible resources in the selected subscription.
-- **Management group** - Applies the savings plan benefit to eligible resources within all subscriptions contained in both the management group and billing scope.
-- **Shared scope** - Applies the savings plan benefit to eligible resources within subscriptions that are in the billing context. If a subscription was moved to different billing context, the benefit will no longer be applied to this subscription and will continue to apply to other subscriptions in the billing context.
-  - For Enterprise Agreement customers, the billing context is the enrollment. The savings plan shared scope would include multiple Microsoft Entra tenants in an enrollment.
-  - For Microsoft Customer Agreement customers, the billing scope is the billing profile. Usage from all billing subscriptions under the billing profile, is eligible to receive benefits for a Shared scoped savings plan.
+- **Resource group scope** - Applies benefits to eligible resources in the selected resource group.
+- **Subscription scope** - Applies benefits to eligible resources in the selected subscription.
+- **Management group** - Applies benefits to eligible resources from all subscriptions in both the management group and billing scope.
+- **Shared scope** - Applies benefits to eligible resources within subscriptions that are in the EA enrollment or MCA billing profile.
+  - If a subscription is moved to different enrollment/billing profile, benefits will no longer be applied to the subscription.
+  - For EA customers, shared scope can include multiple Microsoft Entra tenants in the enrollment.
 
 
-## Scope processing order
 
+## Scope processing order
 While applying savings plan benefits to your usage, Azure processes savings plans in the following order:
-
-1. Savings plans with a single resource group scope.
-2. Savings plans with a single subscription scope.
-3. Savings plans scoped to a management group.
-4. Savings plans with a shared scope.
+1. Savings plans with resource group scope.
+2. Savings plans with subscription scope.
+3. Savings plans with management group scope.
+4. Savings plans shared scope.
 
 You can always update the scope after you buy a savings plan. To do so, go to the savings plan, select **Configuration**, and rescope the savings plan. Rescoping a savings plan isn't a commercial transaction, so your savings plan term isn't changed. For more information about updating the scope, see [Update the scope](manage-savings-plan.md#change-the-savings-plan-scope) after you purchase a savings plan.
 

articles/cost-management-billing/scope-level/manage-licenses-centrally.md

@@ -3,7 +3,7 @@ title: How Azure applies centrally assigned SQL licenses to hourly usage
 description: This article provides a detailed explanation about how Azure applies centrally assigned SQL licenses to hourly usage with Azure Hybrid Benefit.
 author: bandersmsft
 ms.author: banders
-ms.date: 03/21/2024
+ms.date: 05/08/2024
 ms.topic: conceptual
 ms.service: cost-management-billing
 ms.subservice: ahb
@@ -20,6 +20,9 @@ Each resource reports its usage once an hour using the appropriate full price or
 
 The following diagram shows the discounting process when there's enough unutilized NCs to discount the entire vCore consumption by all the SQL resources for the hour.
 
+>[!NOTE]
+> Although the Hyperscale service tier is shown in the diagram, it's no longer available to receive the Azure Hybrid Benefit discount for new Hyperscale databases. Existing Hyperscale single databases with provisioned compute can continue to use Azure Hybrid Benefits to save on compute costs.
+
 Prices shown in the following image are only examples.
 
 :::image type="content" source="./media/manage-licenses-centrally/fully-discounted-consumption.svg" alt-text="Diagram showing fully discounted vCore consumption." border="false" lightbox="./media/manage-licenses-centrally/fully-discounted-consumption.svg":::

articles/machine-learning/tutorial-get-started-with-feature-store.md

@@ -500,6 +500,7 @@ The Storage Blob Data Reader role must be assigned to your user account on the o
 ---
 
    > [!TIP]
+   > - The `timestamp` column should follow `yyyy-MM-ddTHH:mm:ss.fffZ` format. 
    > - The `feature_window_start_time` and `feature_window_end_time` granularity is limited to seconds. Any milliseconds provided in the `datetime` object will be ignored.
    > - A materialization job will only be submitted if data in the feature window matches the `data_status` that is defined while submitting the backfill job.
 
@@ -570,4 +571,4 @@ The [fifth tutorial in the series](./tutorial-develop-feature-set-with-custom-so
 * Learn about [feature store concepts](./concept-what-is-managed-feature-store.md) and [top-level entities in managed feature store](./concept-top-level-entities-in-managed-feature-store.md).
 * Learn about [identity and access control for managed feature store](./how-to-setup-access-control-feature-store.md).
 * View the [troubleshooting guide for managed feature store](./troubleshooting-managed-feature-store.md).
-* View the [YAML reference](./reference-yaml-overview.md).
+* View the [YAML reference](./reference-yaml-overview.md).

articles/storage/files/migrate-files-between-shares.md

@@ -1,21 +1,22 @@
 ---
 title: Migrate files between SMB Azure file shares
-description: Learn how to migrate files from one SMB Azure file share to another using common migration tools.
+description: Learn how to migrate files from one SMB Azure file share to another using Robocopy, a common migration tool.
 ms.service: azure-file-storage
 ms.topic: how-to
-ms.date: 07/26/2023
+ms.date: 05/08/2024
 ms.author: kendownie
 author: khdownie
 ---
 
-# Migrate files between SMB Azure file shares
+# Migrate files from one SMB Azure file share to another
 
-This article describes how to migrate files from one SMB Azure file share to another. One common reason to do this is if you need to migrate from a standard file share to a premium file share to get increased performance for your application workload.
+This article describes how to migrate files between SMB Azure file shares. One common reason to do this is if you need to migrate from a standard file share to a premium file share to get increased performance for your application workload.
 
 > [!WARNING]
 > If you're using Azure File Sync, the migration process is different than described in this article. Instead, see [Migrate files from one Azure file share to another when using Azure File Sync](../file-sync/file-sync-share-to-share-migration.md).
 
 ## Applies to
+
 | File share type | SMB | NFS |
 |-|:-:|:-:|
 | Standard file shares (GPv2), LRS/ZRS | ![Yes](../media/icons/yes-icon.png) | ![No](../media/icons/no-icon.png) |
@@ -51,4 +52,4 @@ Follow these steps to migrate using Robocopy, a command-line file copy utility t
 ## See also
 
 - [Migrate to Azure file shares using RoboCopy](storage-files-migration-robocopy.md)
-- [Migrate files from one Azure file share to another when using Azure File Sync](../file-sync/file-sync-share-to-share-migration.md)
+- [Migrate files from one Azure file share to another when using Azure File Sync](../file-sync/file-sync-share-to-share-migration.md)

articles/storage/files/migrate-files-storage-mover.md

@@ -3,12 +3,12 @@ title: Migrate to SMB Azure file shares using Azure Storage Mover
 description: Learn how to migrate on-premises file shares to SMB Azure file shares with full fidelity using Azure Storage Mover, a fully managed migration service.
 ms.service: azure-file-storage
 ms.topic: how-to
-ms.date: 01/24/2024
+ms.date: 05/08/2024
 ms.author: kendownie
 author: khdownie
 ---
 
-# Migrate to SMB Azure file shares using Azure Storage Mover
+# Use Azure Storage Mover to migrate to SMB Azure file shares
 
 This migration guide describes how to migrate on-premises files to SMB Azure file shares with full fidelity using [Azure Storage Mover](../../storage-mover/service-overview.md), a fully managed migration service. You can use Azure Storage Mover to migrate from any SMB source share, including Windows Server, Linux, or NAS. You must have port 443 open outbound on the source in order to use Azure Storage Mover for Azure Files migrations. However, you don't need an SMB connection to your Azure file share because Azure Storage Mover uses the FileREST API to move the data instead of SMB.
 
@@ -75,4 +75,4 @@ Make sure you've [enabled backup](../../backup/azure-file-share-backup-overview.
 - [What is Azure Storage Mover?](../../storage-mover/service-overview.md)
 - [Plan a successful Azure Storage Mover deployment](../../storage-mover/deployment-planning.md)
 - [Migrate to Azure file shares using Robocopy](storage-files-migration-robocopy.md)
-- [Migrate files from one Azure file share to another when using Azure File Sync](../file-sync/file-sync-share-to-share-migration.md)
+- [Migrate files from one Azure file share to another when using Azure File Sync](../file-sync/file-sync-share-to-share-migration.md)