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

Author: JnHs

.openpublishing.publish.config.json

@@ -1223,6 +1223,7 @@
   "articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
   "articles/dev-box/.openpublishing.redirection.dev-box.json",
   "articles/deployment-environments/.openpublishing.redirection.deployment-environments.json",
-  "articles/network-watcher/.openpublishing.redirection.network-watcher.json"
+  "articles/network-watcher/.openpublishing.redirection.network-watcher.json",
+  "articles/route-server/.openpublishing.redirection.route-server.json"
 ]
 }

.openpublishing.redirection.json

@@ -20,16 +20,6 @@
             "redirect_URL": "tutorial-assess-webapps",
             "redirect_document_id": false
         },
-        {
-            "source_path": "articles/route-server/tutorial-protect-route-server.md",
-            "redirect_URL": "/azure/route-server/tutorial-protect-route-server-ddos",
-            "redirect_document_id": false
-        },
-        {
-            "source_path": "articles/route-server/routing-preference.md",
-            "redirect_url": "/azure/route-server/overview",
-            "redirect_document_id": false
-        },
         {
             "source_path": "articles/cloud-services-extended-support/deploy-visual-studio.md",
             "redirect_url": "/visualstudio/azure/cloud-services-extended-support?context=%2Fazure%2Fcloud-services-extended-support%2Fcontext%2Fcontext",

articles/azure-arc/servers/license-extended-security-updates.md

@@ -1,7 +1,7 @@
 ---
 title: License provisioning guidelines for Extended Security Updates for Windows Server 2012
 description: Learn about license provisioning guidelines for Extended Security Updates for Windows Server 2012 through Azure Arc.
-ms.date: 09/14/2023
+ms.date: 09/27/2023
 ms.topic: conceptual
 ---
 
@@ -37,6 +37,15 @@ An additional scenario (scenario 1, below) is a candidate for VM/Virtual core li
 > In all cases, you are required to attest to their conformance with SA or SPLA. There is no exception for these requirements. Software Assurance or an equivalent Server Subscription is required for you to purchase Extended Security Updates on-premises and in hosted environments. You will be able to purchase Extended Security Updates from Enterprise Agreement (EA), Enterprise Subscription Agreement (EAS), a Server & Cloud Enrollment (SCE), and Enrollment for Education Solutions (EES). On Azure, you do not need Software Assurance to get free Extended Security Updates, but Software Assurance or Server Subscription is required to take advantage of the Azure Hybrid Benefit.
 >
 
+## Cost savings with migration and modernization of workloads
+
+As you migrate and modernize your Windows Server 2012 and Windows 2012 R2 infrastructure through the end of 2023, you can utilize the flexibility of monthly billing with Windows Server 2012 ESUs enabled by Azure Arc for cost savings benefits.
+
+As servers no longer require ESUs because they've been migrated to Azure, Azure VMware Solution (AVS), or Azure Stack HCI (where they’re eligible for free ESUs), or updated to Windows Server 2016 or higher, you can modify the number of cores associated with a license or delete/deactivate licenses. You can also link the license to a new scope of additional servers. See [Programmatically deploy and manage Azure Arc Extended Security Updates licenses](api-extended-security-updates.md) to learn more.
+
+> [!NOTE]
+> This process is not automatic; billing is tied to the activated licenses and you are responsible for modifying your provisioned licensing to take advantage of cost savings.
+> 
 ## Scenario based examples: Compliant and Cost Effective Licensing
 
 ### Scenario 1: Eight modern 32-core hosts (not Windows Server 2012). While each of these hosts are running four 8-core VMs, only one VM on each host is running Windows Server 2012 R2

articles/azure-arc/servers/prepare-extended-security-updates.md

@@ -1,7 +1,7 @@
 ---
 title: How to prepare to deliver Extended Security Updates for Windows Server 2012 through Azure Arc
 description: Learn how to prepare to deliver Extended Security Updates for Windows Server 2012 through Azure Arc.
-ms.date: 07/12/2023
+ms.date: 09/27/2023
 ms.topic: conceptual
 ---
 
@@ -34,7 +34,7 @@ Other Azure services through Azure Arc-enabled servers are available, with offer
 
 ## Prepare delivery of ESUs
 
-To prepare for this new offer, you need to plan and prepare to onboard your machines to Azure Arc-enabled servers through the installation of the [Azure Connected Machine agent](agent-overview.md) and establishing a connection to Azure.
+To prepare for this new offer, you need to plan and prepare to onboard your machines to Azure Arc-enabled servers through the installation of the [Azure Connected Machine agent](agent-overview.md) (version 1.34 or higher) and establishing a connection to Azure.
 
 - **Deployment options:** There are several at-scale onboarding options for Azure Arc-enabled servers, including running a [Custom Task Sequence](onboard-configuration-manager-custom-task.md) through Configuration Manager and deploying a [Scheduled Task through Group Policy](onboard-group-policy-powershell.md).
 

articles/azure-monitor/containers/container-insights-v2-migration.md

@@ -26,7 +26,7 @@ To transition to ContainerLogV2, we recommend the following approach.
 
 The following table highlights the key differences between using ContainerLog and ContainerLogV2 schema.
 
-| Feature Differences  | ContainerLog | ContainerLogV2 |
+| Feature differences  | ContainerLog | ContainerLogV2 |
 | ------------------- | ----------------- | ------------------- |
 | Onboarding | Only configurable through the ConfigMap | Configurable through both the ConfigMap and DCR |
 | Pricing | Only compatible with full-priced analytics logs | Supports the low cost basic logs tier in addition to analytics logs |

articles/azure-resource-manager/management/delete-resource-group.md

@@ -2,7 +2,7 @@
 title: Delete resource group and resources
 description: Describes how to delete resource groups and resources. It describes how Azure Resource Manager orders the deletion of resources when a deleting a resource group. It describes the response codes and how Resource Manager handles them to determine if the deletion succeeded. 
 ms.topic: conceptual
-ms.date: 04/10/2023
+ms.date: 09/27/2023
 ms.custom: seodec18, devx-track-arm-template
 content_well_notification: 
   - AI-contribution
@@ -163,15 +163,27 @@ To delete a resource group, you need access to the delete action for the **Micro
 
 For a list of operations, see [Azure resource provider operations](../../role-based-access-control/resource-provider-operations.md). For a list of built-in roles, see [Azure built-in roles](../../role-based-access-control/built-in-roles.md).
 
-If you have the required access, but the delete request fails, it may be because there's a [lock on the resources or resource group](lock-resources.md). Even if you didn't manually lock a resource group, it may have been [automatically locked by a related service](lock-resources.md#managed-applications-and-locks). Or, the deletion can fail if the resources are connected to resources in other resource groups that aren't being deleted. For example, you can't delete a virtual network with subnets that are still in use by a virtual machine.
+If you have the required access, but the delete request fails, it may be because there's a [lock on the resources or resource group](lock-resources.md). Even if you didn't manually lock a resource group, [a related service may have automatically locked it](lock-resources.md#managed-applications-and-locks). Or, the deletion can fail if the resources are connected to resources in other resource groups that aren't being deleted. For example, you can't delete a virtual network with subnets that are still in use by a virtual machine.
 
-## Accidental deletion
+## Can I recover a deleted resource group?
 
-If you accidentally delete a resource group or resource, in some situations it might be possible to recover it.
+No, you can't recover a deleted resource group. However, you might be able to resore some recently deleted resources.
 
-Some resource types support *soft delete*. You might have to configure soft delete before you can use it. For more information about enabling soft delete, see the documentation for [Azure Key Vault](../../key-vault/general/soft-delete-overview.md), [Azure Backup](../../backup/backup-azure-delete-vault.md), and [Azure Storage](../../storage/blobs/soft-delete-container-overview.md). 
+Some resource types support *soft delete*. You might have to configure soft delete before you can use it. For information about enabling soft delete, see:
 
-You can also [open an Azure support case](../../azure-portal/supportability/how-to-create-azure-support-request.md). Provide as much detail as you can about the deleted resources, including their resource IDs, types, and resource names, and request that the support engineer check if the resources can be restored.
+* [Azure Key Vault soft-delete overview](../../key-vault/general/soft-delete-overview.md)
+* [Azure Storage - Soft delete for containers](../../storage/blobs/soft-delete-container-overview.md)
+* [Azure Storage - Soft delete for blobs](../../storage/blobs/soft-delete-blob-overview.md)
+* [Soft delete for Azure Backup](../../backup/backup-azure-security-feature-cloud.md)
+* [Soft delete for SQL server in Azure VM and SAP HANA in Azure VM workloads](../../backup/soft-delete-sql-saphana-in-azure-vm.md)
+* [Soft delete for virtual machines](../..//backup/soft-delete-virtual-machines.md)
+
+To restore deleted resources, see:
+
+* [Recover deleted Azure AI services resources](../../ai-services/manage-resources.md)
+* [Microsoft Entra - Recover from deletions](../../active-directory/architecture/recover-from-deletions.md)
+
+You can also [open an Azure support case](../../azure-portal/supportability/how-to-create-azure-support-request.md). Provide as much detail as you can about the deleted resources, including their resource IDs, types, and resource names. Request that the support engineer check if the resources can be restored.
 
 > [!NOTE]
 > Recovery of deleted resources is not possible under all circumstances. A support engineer will investigate your scenario and advise you whether it's possible.

articles/communication-services/concepts/voice-video-calling/call-recording.md

@@ -15,7 +15,7 @@ ms.subservice: calling
 # Call Recording overview
 
 > [!NOTE]
->  Call Recording is not enabled for [Teams interoperability](../teams-interop.md).
+>  Call Recording for [Teams interoperability](../call-automation/call-automation-teams-interop.md) is now in Public Preview.
 
 Call Recording enables you to record multiple calling scenarios available in Azure Communication Services by providing you with a set of APIs to start, stop, pause and resume recording. Whether it's a PSTN, WebRTC, or SIP call, these APIs can be accessed from your server-side business logic. Also, recordings can be triggered by a user action that tells the server application to start recording. 
 
@@ -146,9 +146,12 @@ Many countries/regions and states have laws and regulations that apply to call r
 Regulations around the maintenance of personal data require the ability to export user data. In order to support these requirements, recording metadata files include the participantId for each call participant in the `participants` array. You can cross-reference the Azure Communication Services User Identity in the `participants` array with your internal user identities to identify participants in a call. 
 
 ## Next steps
-For more information, see the following articles:
 
-- Learn more about Call recording, check out the [Call Recording Quickstart](../../quickstarts/voice-video-calling/get-started-call-recording.md).
+> [!div class="nextstepaction"]
+> [Get started with Call Recording](../../quickstarts/voice-video-calling/get-started-call-recording.md).
+
+Here are some articles of interest to you:
+
 - Learn more about call recording [Insights](../analytics/insights/call-recording-insights.md) and [Logs](../analytics/logs/recording-logs.md)
 - Learn more about [Call Automation](../../quickstarts/call-automation/callflows-for-customer-interactions.md).
 - Learn more about [Video Calling](../../quickstarts/voice-video-calling/get-started-with-video-calling.md).

articles/data-factory/continuous-integration-delivery-automate-github-actions.md

@@ -95,6 +95,9 @@ The workflow is composed of two jobs:
 
     :::image type="content" source="media/continuous-integration-delivery-github-actions/saving-package-json-file.png" lightbox="media/continuous-integration-delivery-github-actions/saving-package-json-file.png" alt-text="Screenshot of saving the package.json file in GitHub.":::
 
+> [!IMPORTANT]
+> Make sure to place the build folder under the root folder of your connected repository. In the above example and workflow, the root folder is ADFroot. If you are not sure what is your root folder, navigate to your Data Factory instance, Manage tab -> Git configuration -> Root folder.
+
 2. Navigate to the Actions tab -> New workflow
 
    :::image type="content" source="media/continuous-integration-delivery-github-actions/new-workflow.png" lightbox="media/continuous-integration-delivery-github-actions/new-workflow.png" alt-text="Screenshot of creating a new workflow in GitHub.":::

articles/route-server/.openpublishing.redirection.route-server.json

@@ -1,18 +1,33 @@
 {
     "redirections": [
         {
-            "source_path": "articles/route-server/vmware-solution-default-route.md",
+            "source_path_from_root": "/articles/route-server/vmware-solution-default-route.md",
             "redirect_URL": "/azure/azure-vmware/concepts-network-design-considerations",
             "redirect_document_id": false
         },
         {
-            "source_path": "articles/route-server/tutorial-protect-route-server.md",
+            "source_path_from_root": "/articles/route-server/resource-manager-template-samples.md",
+            "redirect_url": "/azure/route-server/tutorial-configure-route-server-with-quagga",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/route-server/tutorial-protect-route-server.md",
             "redirect_URL": "/azure/route-server/tutorial-protect-route-server-ddos",
             "redirect_document_id": false
         },
         {
-            "source_path_from_root": "/articles/route-server/resource-manager-template-samples.md",
-            "redirect_url": "/azure/route-server/tutorial-configure-route-server-with-quagga",
+            "source_path_from_root": "/articles/route-server/routing-preference.md",
+            "redirect_url": "/azure/route-server/overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/route-server/vmware-solution-default-route.md",
+            "redirect_URL": "/azure/azure-vmware/concepts-network-design-considerations",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/route-server/tutorial-protect-route-server.md",
+            "redirect_URL": "/azure/route-server/tutorial-protect-route-server-ddos",
             "redirect_document_id": false
         },
         {

articles/route-server/hub-routing-preference-powershell.md

@@ -12,7 +12,7 @@ ms.date: 07/31/2023
 
 # Configure routing preference to influence route selection using PowerShell
 
-Learn how to use [routing preference (preview)](routing-preference.md) setting in Azure Route Server to influence its route selection. 
+Learn how to use [routing preference (preview)](hub-routing-preference.md) setting in Azure Route Server to influence its route selection. 
 
 > [!IMPORTANT]
 > Routing preference is currently in PREVIEW.