Merge branch 'main' into release-postgres-flexible

Author: v-alje

articles/active-directory-b2c/azure-monitor.md

@@ -349,7 +349,7 @@ To stop collecting logs to your Log Analytics workspace, delete the diagnostic s
 1. Sign in to the [Azure portal](https://portal.azure.com).
 1. If you have access to multiple tenants, select the **Settings** icon in the top menu to switch to your Microsoft Entra ID tenant from the **Directories + subscriptions** menu.
 1. Choose the resource group that contains the Log Analytics workspace. This example uses a resource group named _azure-ad-b2c-monitor_ and a Log Analytics workspace named `AzureAdB2C`.
-1. [Delete the Logs Analytics workspace](../azure-monitor/logs/delete-workspace.md#azure-portal).
+1. [Delete the Logs Analytics workspace](../azure-monitor/logs/delete-workspace.md).
 1. Select the **Delete** button to delete the resource group.
 ## Next steps
 

articles/advisor/advisor-reference-cost-recommendations.md

@@ -23,39 +23,39 @@ Azure Advisor helps you optimize and reduce your overall Azure spend by identify
 
 ## AI Services
 
-### Potential Cost Savings on this Form Recognizer Resource
+### Potential Cost Savings on this Document Intelligence Resource
 
-We observed that your Form Recognizer resource has had enough usage in the past 30 days for you to consider using a Commitment tier.
+We observed that your Document Intelligence (formerly Form Recognizer) resource had enough usage in the past 30 days for you to consider using a Commitment tier.
 
-Learn more about [Cognitive Service - AzureAdvisorFRCommitment (Potential Cost Savings on this Form Recognzier Resource)](https://azure.microsoft.com/pricing/details/form-recognizer/).
+Learn more about [Cognitive Service - AzureAdvisorFRCommitment (Potential Cost Savings on this Computer Vision Resource)](https://azure.microsoft.com/pricing/details/cognitive-services/computer-vision/).
 
 ### Potential Cost Savings on this Computer Vision Resource
 
-We observed that your Computer Vision resource has had enough READ usage in the past 30 days for you to consider using a Commitment tier.
+We observed that your Computer Vision resource had enough READ usage in the past 30 days for you to consider using a Commitment tier.
 
 Learn more about [Cognitive Service - AzureAdvisorCVReadCommitment (Potential Cost Savings on this Computer Vision Resource)](https://azure.microsoft.com/pricing/details/cognitive-services/computer-vision/).
 
 ### Potential Cost Savings on this Speech Service Resource
 
-We observed that your Speech Service resource has had enough usage in the past 30 days for you to consider using a Commitment tier.
+We observed that your Speech Service resource had enough usage in the past 30 days for you to consider using a Commitment tier.
 
-Learn more about [Cognitive Service - AzureAdvisorSpeechCommitment (Potential Cost Savings on this Speech Service Resource)](https://azure.microsoft.com/pricing/details/form-recognizer/).
+Learn more about [Cognitive Service - AzureAdvisorSpeechCommitment (Azure AI Document Intelligence pricing)](https://azure.microsoft.com/pricing/details/ai-document-intelligence/).
 
 ### Potential Cost Savings on this Translator Resource
 
-We observed that your Translator resource has had enough usage in the past 30 days for you to consider using a Commitment tier.
+We observed that your Translator resource had enough usage in the past 30 days for you to consider using a Commitment tier.
 
 Learn more about [Cognitive Service - AzureAdvisorTranslatorCommitment (Potential Cost Savings on this Translator Resource)](https://azure.microsoft.com/pricing/details/cognitive-services/translator/).
 
 ### Potential Cost Savings on this LUIS Resource
 
-We observed that your LUIS resource has had enough usage in the past 30 days for you to consider using a Commitment tier.
+We observed that your LUIS resource had enough usage in the past 30 days for you to consider using a Commitment tier.
 
 Learn more about [Cognitive Service - AzureAdvisorLUISCommitment (Potential Cost Savings on this LUIS Resource)](https://azure.microsoft.com/pricing/details/cognitive-services/language-understanding-intelligent-services/).
 
 ### Potential Cost Savings on this Language Service Resource
 
-We observed that your Language Service resource has had enough usage in the past 30 days for you to consider using a Commitment tier.
+We observed that your Language Service resource had enough usage in the past 30 days for you to consider using a Commitment tier.
 
 Learn more about [Cognitive Service - AzureAdvisorTextAnalyticsCommitment (Potential Cost Savings on this Language Service Resource)](https://azure.microsoft.com/pricing/details/cognitive-services/language-service/).
 
@@ -235,7 +235,7 @@ Learn more about [Azure Cosmos DB account - CosmosDBMigrateToManualThroughputFro
 
 ### Azure Monitor
 
-For Azure Monitor cost optimization suggestions, please see [Optimize costs in Azure Monitor](../azure-monitor/best-practices-cost.md).
+For Azure Monitor cost optimization suggestions, see [Optimize costs in Azure Monitor](../azure-monitor/best-practices-cost.md).
 
 ### Purchasing a savings plan for compute could unlock lower prices
 
@@ -304,7 +304,7 @@ Learn more about [Subscription - SQLReservedCapacity (Consider SQL PaaS DB reser
 
 ### Consider App Service stamp fee reserved instances to save over your on-demand costs
 
-We analyzed your App Service isolated environment stamp fees usage pattern over last 30 days and recommend a Reserved Instance purchase to maximize your savings. With reserved instances, you can prepurchase hourly usage for the isolated environment stamp fee and save over your pay-as-you-go costs. Reserved instances only applies to the stamp fee and not to the App Service instances. Reserved Instance is a billing benefit and automatically applies to new or existing deployments. Saving estimates are calculated for individual subscriptions based on usage pattern over last 30 days.
+We analyzed your App Service isolated environment stamp fees usage pattern over last 30 days and recommend a Reserved Instance purchase to maximize your savings. With reserved instances, you can prepurchase hourly usage for the isolated environment stamp fee and save over your pay-as-you-go costs. Reserved instances only apply to the stamp fee and not to the App Service instances. Reserved Instance is a billing benefit and automatically applies to new or existing deployments. Saving estimates are calculated for individual subscriptions based on usage pattern over last 30 days.
 
 Learn more about [Subscription - AppServiceReservedCapacity (Consider App Service stamp fee reserved instances to save over your on-demand costs)](https://aka.ms/rirecommendations).
 
@@ -378,7 +378,7 @@ Learn more about [Subscription - AzureVMwareSolutionReservedCapacity (Consider A
 
 We analyzed your NetApp Storage usage over last 30 days and calculated a Reserved Instance purchase that would maximize your savings. With reserved instances, you can prepurchase hourly usage and save over your current on-demand costs. Reserved Instance is a billing benefit and automatically applies to new or existing deployments. Saving estimates are calculated for individual subscriptions and the usage pattern observed over last 30 days. Shared scope recommendations are available in reservation purchase experience and can increase savings further.
 
-Learn more about [Subscription - NetAppStorageReservedCapacity (Consider NetApp Storage reserved instances to save over your on-demand costs)](https://aka.ms/rirecommendations).
+Learn more about [Subscription - NetAppStorageReservedCapacity (Optimize costs for Azure Files with Reservations)](/azure/storage/files/files-reserve-capacity).
 
 ### Consider Azure Managed Disk reserved instances to save over your on-demand costs
 
@@ -424,7 +424,7 @@ Learn more about [Reservation - ReservedInstancePurchaseNew (Configure automatic
 
 ### Purchasing a savings plan for compute could unlock lower prices
 
-We analyzed your compute usage over the last 30 days and recommend adding a savings plan to increase your savings. The savings plan unlocks lower prices on select compute services when you commit to spend a fixed hourly amount for 1 or 3 years. As you use select compute services globally, your usage is covered by the plan at reduced prices. During the times when your usage is above your hourly commitment, you’ll simply be billed at your regular pay-as-you-go prices. With savings automatically applying across compute usage globally, you’ll continue saving even as your usage needs change over time. Savings plan are more suited for dynamic workloads while accommodating for planned or unplanned changes while reservations are more suited for stable, predictable workloads with no planned changes. Saving estimates are calculated for individual subscriptions and the usage pattern observed over last 30 days. Shared scope savings plans are available in purchase experience and can further increase savings.
+We analyzed your compute usage over the last 30 days and recommend adding a savings plan to increase your savings. The savings plan unlocks lower prices on select compute services when you commit to spend a fixed hourly amount for one or three years. As you use select compute services globally, your usage is covered by the plan at reduced prices. During the times when your usage is above your hourly commitment, you’ll be billed at your regular pay-as-you-go prices. With savings automatically applying across compute usage globally, you’ll continue saving even as your usage needs change over time. Savings plan are more suited for dynamic workloads while accommodating for planned or unplanned changes while reservations are more suited for stable, predictable workloads with no planned changes. Saving estimates are calculated for individual subscriptions and the usage pattern observed over last 30 days. Shared scope savings plans are available in purchase experience and can further increase savings.
 
 Learn more about [Subscription - SavingsPlan (Purchasing a savings plan for compute could unlock lower prices)](https://aka.ms/savingsplan-compute).
 
@@ -480,7 +480,7 @@ Learn more about [App Service plans](../app-service/overview-hosting-plans.md).
 
 ### Unused/Empty App Service plans
 
-Your App Service plan has no apps running for at least 3 days. Consider deleting the resource to save costs or add new apps under it.
+Your App Service plan has no apps running for at least three days. Consider deleting the resource to save costs or add new apps under it.
 
 > [!NOTE]
 > It might take up to 48 hours for this recommendation to refresh after you take an action.

articles/ai-services/openai/concepts/models.md

@@ -108,10 +108,10 @@ See [model versions](../concepts/model-versions.md) to learn about how Azure Ope
 
 ### GPT-4 and GPT-4 Turbo Preview model availability
 
-| Model Availability | gpt-4 (0314) | gpt-4 (0613) | gpt-4 (1106-preview) | `gpt-4` (vision-preview) | 
+| Model Availability | gpt-4 (0314) | gpt-4 (0613) | gpt-4 (1106-preview) | gpt-4 (vision-preview) | 
 |---|:---|:---|:---|:---|
-| Available to all subscriptions with Azure OpenAI access | | Australia East <br> Canada East <br> France Central <br> Sweden Central <br> Switzerland North | Australia East <br> Canada East <br> East US 2 <br> France Central <br> Norway East <br> South India <br> Sweden Central <br> UK South <br> West US | Australia East <br> Sweden Central <br> Switzerland North <br> West US | 
-| Available to subscriptions with current access to the model version in the region | East US <br> France Central <br> South Central US <br> UK South | East US <br> East US 2 <br> Japan East <br> UK South | |
+| Available to all subscriptions with Azure OpenAI access | | Australia East <br> Canada East <br> France Central <br> Sweden Central <br> Switzerland North | Australia East <br> Canada East <br> East US 2 <br> France Central <br> Norway East <br> South India <br> Sweden Central <br> UK South <br> West US | Australia East <br> Switzerland North <br> West US | 
+| Available to subscriptions with current access to the model version in the region | East US <br> France Central <br> South Central US <br> UK South | East US <br> East US 2 <br> Japan East <br> UK South | | Sweden Central|
 
 ### GPT-3.5 models
 

articles/aks/concepts-clusters-workloads.md

@@ -1,25 +1,25 @@
 ---
-title: Concepts - Kubernetes basics for Azure Kubernetes Services (AKS)
-description: Learn the basic cluster and workload components of Kubernetes and how they relate to features in Azure Kubernetes Service (AKS)
+title: Azure Kubernetes Services (AKS) Core Basic Concepts
+description: Learn about the core components that make up workloads and clusters in Kubernetes and their counterparts on Azure Kubernetes Services (AKS).
 ms.topic: conceptual
 ms.custom: build-2023
-ms.date: 12/04/2023
+ms.date: 12/13/2023
 ---
 
-# Kubernetes core concepts for Azure Kubernetes Service (AKS)
+# Core Kubernetes concepts for Azure Kubernetes Service
 
 Application development continues to move toward a container-based approach, increasing our need to orchestrate and manage resources. As the leading platform, Kubernetes provides reliable scheduling of fault-tolerant application workloads. Azure Kubernetes Service (AKS), a managed Kubernetes offering, further simplifies container-based application deployment and management.
 
-This article introduces:
-* Core Kubernetes infrastructure components:
+This article introduces core concepts:
+* Kubernetes infrastructure components:
     * *control plane*
     * *nodes*
     * *node pools*
 * Workload resources: 
     * *pods*
     * *deployments*
-    * *sets* 
-* How to group resources into *namespaces*.
+    * *sets*
+* Group resources using *namespaces*.
 
 ## What is Kubernetes?
 

articles/api-management/migrate-stv1-to-stv2.md

@@ -33,7 +33,7 @@ For more information about the `stv1` and `stv2` platforms and the benefits of u
 
 API Management platform migration from `stv1` to `stv2` involves updating the underlying compute alone and has no impact on the service/API configuration persisted in the storage layer.
 
-* The upgrade process involves creating a new compute in parallel the old compute. Both instances coexist for 48 hours.
+* The upgrade process involves creating a new compute in parallel to the old compute. The old compute takes 15-45 mins to be deleted with an option to delay it for up to 48 hours.
 * The API Management status in the Portal will be "Updating".
 * Azure manages the management endpoint DNS, and updates to the new compute immediately on successful migration. 
 * The Gateway DNS still points to the old compute if custom domain is in use. 
@@ -205,7 +205,7 @@ On successful migration, update any network dependencies including DNS, firewall
 
 - **Will the migration cause a downtime?**
 
-   ***VNet-injected instances:***  there's no downtime as the old and new managed gateways are available for 48 hours, to facilitate validation and DNS update. However, if the default domain names are in use, traffic is routed to the new managed gateway immediately. It's critical that all network dependencies are taken care of upfront, for the impacted APIs to be functional.
+   ***VNet-injected instances:***  since the old gateway is purged only after the new compute is healthy and online, there shouldn't be any downtime if default hostnames are in use. It's critical that all network dependencies are taken care of upfront, for the impacted APIs to be functional. However, if custom domains are in use, they'll be pointing to the purged compute until they're updated which may cause a downtime. Alternatively, you can request for the old gateway to be retained for up to 48 hours by creating a support ticket in advance. Having the old and the new compute coexist will facilitate validation, and then you can update the custom DNS entries at will.
 
    ***Non-VNet instances:*** there's a downtime of approximately 15 minutes only if you choose to preserve the original IP address. However, there's no downtime if you migrate with a new IP address.
 
@@ -262,7 +262,7 @@ On successful migration, update any network dependencies including DNS, firewall
 
 - **Can I roll back the migration if required?**
 
-   Yes, you can. If there's a failure during the migration process, the instance will automatically roll back to the `stv1` platform. However, if you encounter any other issues post migration, you have 48 hours to request a rollback by contacting Azure support. You should contact support if the instance is stuck in an "Updating" status for more than 2 hours.
+   Yes, you can. If there's a failure during the migration process, the instance will automatically roll back to the stv1 platform. However, if you encounter any other issues post migration, you can roll back only if you have requested an extension to the old gateway purge. By default, the old gateway is purged in 15 mins that can be extended up to 48 hours by contacting support in advance. You should make sure to contact support before the old gateway is purged, if a rollback is required. Note to contact support if  the instance is stuck in an "Updating" status for more than 2 hours.
 
 - **Is there any change required in custom domain/private DNS zones?**
 
@@ -282,14 +282,14 @@ On successful migration, update any network dependencies including DNS, firewall
 - **Can I upgrade my stv1 instance to the same subnet?**
 
    - You can't migrate the stv1 instance to the same subnet in a single pass without downtime. However, you can optionally move your migrated instance back to the original subnet. More details [here](#optional-migrate-back-to-original-vnet-and-subnet).
-   - The old gateway takes up to 48 hours to vacate the subnet, so that you can initiate the move. However, you can request for a faster release of the subnet by submitting the subscription IDs and the desired release time through a support ticket.
+   - The old gateway takes between 15 mins to 45 mins to vacate the subnet, so that you can initiate the move. However, you can request to increase this time to up to 48 hours by a support ticket.
    - Releasing the old subnet calls for a purge of the old gateway, which forfeits the rollback to the old gateway if desired.
    - A new public IP is required for each switch
    - Ensure that the old subnet networking for [NSG](./api-management-using-with-internal-vnet.md?tabs=stv2#configure-nsg-rules) and [firewall](./api-management-using-with-vnet.md?tabs=stv2#force-tunnel-traffic-to-on-premises-firewall-using-expressroute-or-network-virtual-appliance) is updated for `stv2` dependencies.
 
 - **Can I test the new gateway before switching the live traffic?**
 
-   - Post successful migration, the old and the new managed gateways are active to receive traffic. The old gateway remains active for 48 hours. 
+   - By default, the old and the new managed gateways coexist for 15 mins, which is a small window of time to validate the deployment. You can request to increase this time to up to 48 hours through a support ticket. This change keeps the old and the new managed gateways active to receive traffic and facilitate validation.
    - The migration process automatically updates the default domain names, and if being used, the traffic routes to the new gateways immediately.
    - If custom domain names are in use, the corresponding DNS records might need to be updated with the new IP address if not using CNAME. Customers can update their host file to the new API Management IP and validate the instance before making the switch. During this validation process, the old gateway continues to serve the live traffic.
 
@@ -313,6 +313,11 @@ On successful migration, update any network dependencies including DNS, firewall
 
    Check details [here](#help-and-support).
 
+## Video
+
+> [!VIDEO https://learn.microsoft.com/_themes/docs.theme/master/en-us/_themes/global/video-embed.html?id=0e082046-7a52-48b6-8818-6997eb422992]
+>
+>
 
 ## Related content