Merge pull request #302586 from MicrosoftDocs/repo_sync_working_branch

Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)

Author: TimShererWithAquent

articles/azure-resource-manager/management/azure-services-resource-providers.md

@@ -236,14 +236,6 @@ The resource providers for management services are:
 | Microsoft.SoftwarePlan | License |
 | Microsoft.Solutions | [Azure Managed Applications](../managed-applications/index.yml) |
 
-## Media resource providers
-
-The resource providers for media services are:
-
-| Resource provider namespace | Azure service |
-| --------------------------- | ------------- |
-| Microsoft.Media | [Media Services](/azure/media-services/) |
-
 ## Migration resource providers
 
 The resource providers for migration services are:

articles/communication-services/quickstarts/advanced-messaging/whatsapp/includes/interactive/messages-quickstart-interactive-messages-java.md

@@ -102,7 +102,7 @@ InteractiveMessage interactiveMessage = new InteractiveMessage(
 interactiveMessage.setFooter(new TextMessageContent("Logistic Ltd"));
 interactiveMessage.setHeader(new TextMessageContent("Shipping Options"));
 
-InteractiveNotificationContent interactiveMessageContent new InteractiveNotificationContent("<CHANNEL_ID>", recipients, interactiveMessage);
+InteractiveNotificationContent interactiveMessageContent = new InteractiveNotificationContent("<CHANNEL_ID>", recipients, interactiveMessage);
 
 // Send an interactive message
 SendMessageResult textMessageResult = notificationClient.send(interactiveMessageContent);
@@ -134,7 +134,7 @@ buttonActions.add(new ButtonContent("yes",  "Yes"));
 ButtonSetContent buttonSet = new ButtonSetContent(buttonActions);
 InteractiveMessage interactiveMessage = new InteractiveMessage(new TextMessageContent("Do you want to proceed?"), new WhatsAppButtonActionBindings(buttonSet));
 
-InteractiveNotificationContent interactiveMessageContent new InteractiveNotificationContent("<CHANNEL_ID>", recipients, interactiveMessage);
+InteractiveNotificationContent interactiveMessageContent = new InteractiveNotificationContent("<CHANNEL_ID>", recipients, interactiveMessage);
 
 // Send an interactive message
 SendMessageResult textMessageResult = notificationClient.send(interactiveMessageContent);
@@ -159,12 +159,12 @@ The Messages SDK enables Contoso to send interactive WhatsApp messages, when ini
 In this example, the business sends a click to a link message to the user.
 
 ```java
-LinkContent urlAction = new LinkContent("Click here to find out", "https://wallpapercave.com/wp/wp2163723.jpg");
+LinkContent urlAction = new LinkContent("Find out more", "https://wallpapercave.com/wp/wp2163723.jpg");
 InteractiveMessage interactiveMessage = new InteractiveMessage(
     new TextMessageContent("The best Guardian of Galaxy"), new WhatsAppUrlActionBindings(urlAction));
 interactiveMessage.setFooter(new TextMessageContent("Intergalactic New Ltd"));
 
-InteractiveNotificationContent interactiveMessageContent new InteractiveNotificationContent("<CHANNEL_ID>", recipients, interactiveMessage);
+InteractiveNotificationContent interactiveMessageContent = new InteractiveNotificationContent("<CHANNEL_ID>", recipients, interactiveMessage);
 
 // Send an interactive message
 SendMessageResult textMessageResult = notificationClient.send(interactiveMessageContent);

articles/storage/blobs/blob-inventory.md

@@ -434,6 +434,16 @@ If a container or directory is deleted with soft-delete enabled, then the contai
 
 Only blobs that are explicitly deleted appear in reports. Therefore, to obtain a complete listing of all soft-deleted blobs (directory and all child blobs), workloads should delete each blob in a directory before deleting the directory itself.
 
+### Handling duplicates in Blob Inventory
+
+Blob Inventory operates on a distributed system, which means that in rare cases, duplicate blob entries might appear in your reports.
+
+If when post processing your inventory report, your use case requires unique blob entries, you can use the `Name` field to identify and return only the unique blobs. 
+
+  
+If your report includes blob versions, use both the `Name` and `Version ID` fields together to identify and return only the unique blobs and versions.
+
+
 ## Next steps
 
 - [Enable Azure Storage blob inventory reports](blob-inventory-how-to.md)

articles/update-manager/security-awareness-ubuntu-support.md

@@ -17,21 +17,23 @@ ms.date: 02/26/2025
 
 This article provides the details on security vulnerabilities and Ubuntu Pro support in Azure Update Manager.
 
-If you are using an Ubuntu 18.04 LTS image, you should take necessary steps against security vulnerabilities as the operating system reached the [end of its standard support](https://ubuntu.com/18-04/azure) in May 2023. As Canonical has stopped publishing new security or critical updates after May 2023, the risk of systems and data to potential security threats is high. Without software updates, you may experience performance issues or compatibility issues whenever a new hardware or software is released.
+Standard Ubuntu Long-Term Support (LTS) provides security updates for packages in the `Main` repository. However, it does not include security patching from Canonical for the thousands of packages in the `Universe` repository. This can expose systems to security threats even on a fully patched, supported LTS version.
 
-You can either upgrade to [Ubuntu Pro](https://ubuntu.com/azure/pro) or migrate to a newer version of LTS to avoid any future disruption to the patching mechanisms. When you [upgrade to Ubuntu Pro](https://ubuntu.com/blog/enhancing-the-ubuntu-experience-on-azure-introducing-ubuntu-pro-updates-awareness), you can avoid any security or performance issues. 
+For systems where the operating system has reached the [end of its standard support](https://ubuntu.com/about/release-cycle), such as Ubuntu 20.04 LTS, the risk is higher as security updates are no longer provided for the `Main` repository either.
+
+To address potential patching disruptions, you can either **migrate to a newer version of LTS** or **enable Ubuntu Pro**. Migrating to a newer LTS version restores standard support for the `Main` repository. Enabling Ubuntu Pro provides [Expanded Security Maintenance (ESM)](https://ubuntu.com/security/esm), which delivers patches for the `Universe` repository on all LTS versions (`esm-apps`) and extends patching for the `Main` repository on systems that are past their standard support window (`esm-infra`).
 
 
 ## Ubuntu Pro on Azure Update Manager
 
-Azure Update Manager assesses both Azure and Arc-enabled VMs to indicate any action. AUM helps to identify Ubuntu instances that don't have the available security updates and allows an upgrade to Ubuntu Pro from the Azure portal. For example, an Ubuntu server 18.04 LTS instance on Azure Update Manager has information about upgrading to Ubuntu Pro.
+Azure Update Manager assesses both Azure and Arc-enabled VMs to identify available security updates. It will highlight when an Ubuntu VM has vulnerabilities that can be patched by enabling Ubuntu Pro. This applies to vulnerabilities in the `Universe` repository for any LTS version, and to systems past their standard support period. For example, an Ubuntu Server 18.04 LTS instance on Azure Update Manager has information about upgrading to Ubuntu Pro.
 
 :::image type="content" source="./media/security-awareness-ubuntu-support/ubuntu-pro-subscription-inline.png" alt-text="Screenshot of recommendation to subscribe to Ubuntu Pro in Azure Update Manager." lightbox="./media/security-awareness-ubuntu-support/ubuntu-pro-subscription-expanded.png":::
 
 You can continue to use the Azure Update Manager [capabilities](updates-maintenance-schedules.md) to remain secure after migrating to a supported model from Canonical.
 
 > [!NOTE]
-> - [Ubuntu Pro](https://ubuntu.com/azure/pro) will provide the support on 18.04 LTS from Canonical until 2028 through Expanded Security Maintenance (ESM). You can also [upgrade to Ubuntu Pro from Azure Marketplace](https://azuremarketplace.microsoft.com/marketplace/apps/canonical.0001-com-ubuntu-pro-bionic?tab=Overview) as well.
+> For detailed information on Ubuntu LTS release cycles, end-of-support dates, and official upgrade paths, see the [Canonical Ubuntu LTS end of standard support guidance](/azure/virtual-machines/workloads/canonical/ubuntu-els-guidance).
 > - Ubuntu offers 20.04 LTS and 22.04 LTS as a migration from 18.04 LTS. [Learn more](https://ubuntu.com/18-04/azure).