Skip to content

Commit 2af8baa

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into waf-agc
2 parents 5e65032 + 0b303e5 commit 2af8baa

File tree

13 files changed

+118
-84
lines changed

13 files changed

+118
-84
lines changed

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -236,14 +236,6 @@ The resource providers for management services are:
236236
| Microsoft.SoftwarePlan | License |
237237
| Microsoft.Solutions | [Azure Managed Applications](../managed-applications/index.yml) |
238238

239-
## Media resource providers
240-
241-
The resource providers for media services are:
242-
243-
| Resource provider namespace | Azure service |
244-
| --------------------------- | ------------- |
245-
| Microsoft.Media | [Media Services](/azure/media-services/) |
246-
247239
## Migration resource providers
248240

249241
The resource providers for migration services are:

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ InteractiveMessage interactiveMessage = new InteractiveMessage(
102102
interactiveMessage.setFooter(new TextMessageContent("Logistic Ltd"));
103103
interactiveMessage.setHeader(new TextMessageContent("Shipping Options"));
104104

105-
InteractiveNotificationContent interactiveMessageContent new InteractiveNotificationContent("<CHANNEL_ID>", recipients, interactiveMessage);
105+
InteractiveNotificationContent interactiveMessageContent = new InteractiveNotificationContent("<CHANNEL_ID>", recipients, interactiveMessage);
106106

107107
// Send an interactive message
108108
SendMessageResult textMessageResult = notificationClient.send(interactiveMessageContent);
@@ -134,7 +134,7 @@ buttonActions.add(new ButtonContent("yes", "Yes"));
134134
ButtonSetContent buttonSet = new ButtonSetContent(buttonActions);
135135
InteractiveMessage interactiveMessage = new InteractiveMessage(new TextMessageContent("Do you want to proceed?"), new WhatsAppButtonActionBindings(buttonSet));
136136

137-
InteractiveNotificationContent interactiveMessageContent new InteractiveNotificationContent("<CHANNEL_ID>", recipients, interactiveMessage);
137+
InteractiveNotificationContent interactiveMessageContent = new InteractiveNotificationContent("<CHANNEL_ID>", recipients, interactiveMessage);
138138

139139
// Send an interactive message
140140
SendMessageResult textMessageResult = notificationClient.send(interactiveMessageContent);
@@ -159,12 +159,12 @@ The Messages SDK enables Contoso to send interactive WhatsApp messages, when ini
159159
In this example, the business sends a click to a link message to the user.
160160

161161
```java
162-
LinkContent urlAction = new LinkContent("Click here to find out", "https://wallpapercave.com/wp/wp2163723.jpg");
162+
LinkContent urlAction = new LinkContent("Find out more", "https://wallpapercave.com/wp/wp2163723.jpg");
163163
InteractiveMessage interactiveMessage = new InteractiveMessage(
164164
new TextMessageContent("The best Guardian of Galaxy"), new WhatsAppUrlActionBindings(urlAction));
165165
interactiveMessage.setFooter(new TextMessageContent("Intergalactic New Ltd"));
166166

167-
InteractiveNotificationContent interactiveMessageContent new InteractiveNotificationContent("<CHANNEL_ID>", recipients, interactiveMessage);
167+
InteractiveNotificationContent interactiveMessageContent = new InteractiveNotificationContent("<CHANNEL_ID>", recipients, interactiveMessage);
168168

169169
// Send an interactive message
170170
SendMessageResult textMessageResult = notificationClient.send(interactiveMessageContent);

articles/dns/dns-private-resolver-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.author: allensu
1313

1414
# What is Azure DNS Private Resolver?
1515

16-
Azure DNS Private Resolver is a new service that enables you to query Azure DNS private zones from an on-premises environment and vice versa without deploying VM based DNS servers.
16+
Azure DNS Private Resolver is a fully managed, highly available service that enables secure and seamless DNS resolution between Azure virtual networks and on-premises environments—without the need to deploy, manage, or patch custom DNS servers. This service lets you resolve DNS queries for private DNS zones from anywhere, facilitating hybrid network connectivity and simplifying network management for enterprise scenarios.
1717

1818
## How does it work?
1919

articles/education-hub/azure-dev-tools-teaching/about-program.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@ description: Learn about the benefits that the Azure Dev Tools for Teaching prog
44
author: denrea
55
ms.author: rymend
66
ms.topic: overview
7-
ms.date: 06/30/2020
7+
ms.date: 07/11/2025
88
ms.service: azure-education
99
---
1010

1111
# What is Azure Dev Tools for Teaching?
1212

13+
**Azure Dev Tools for Teaching will be adjusting its access policy on August 15th, 2025. After that date, only existing administrators will retain continued access and no new administrator signups will be allowed. If you are currently eligible but are not signed up, please sign up before August 15th, 2025.**
14+
1315
Azure Dev Tools for Teaching puts professional developer tools, software, and services from Microsoft in the hands of faculty and students. Plans in the program are part of various academic Volume Licensing agreements.
1416

1517
Students receive developer tools at no cost--everything they need to create apps, games, and websites. With this access, students can chase their dreams, create the next breakthrough in technology, or get a head start on their career.

articles/education-hub/faq.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: vinnieangel
55
ms.author: vangellotti
66
ms.service: azure-education
77
ms.topic: tutorial
8-
ms.date: 4/2/2024
8+
ms.date: 7/11/2025
99
ms.custom: template-tutorial
1010
---
1111

@@ -142,6 +142,22 @@ Your Azure for Students Starter subscription gives you access to certain softwar
142142

143143
## Azure Dev Tools for Teaching
144144

145+
### My institution is already signed up for Azure Dev Tools for Teaching, do I need to do anything before August 15th, 2025 to retain access?
146+
147+
No action is needed. Your admin will retain access to Azure Dev Tools for Teaching benefits for an extended period of time, without the need for renewal.
148+
149+
### If my institution is not already signed up for Azure Dev Tools for Teaching, what do they need to do before August 15th, 2025?
150+
151+
If your institution has an active VL agreement but has not yet signed up for their ADT4T benefit, they have until August 1st, 2025 to redeem their benefit. They can do so by going to Azure Dev Tools for Teaching website and selecting ‘Order’. To learn more about Azure Dev Tools for Teaching, click here.
152+
153+
### How will my students get access to Azure Dev Tools for Teaching after August 15th, 2025?
154+
155+
If your institution is signed up for Azure Dev Tools for Teaching, your students will now be getting access to their software benefit through the Azure for Students offer. This provides them with the same software, in the same location they currently access. In addition, they will receive an Azure subscription with $100 free Azure credit to use on Azure services. No credit card is required to sign up, simply sign in with their institution ID as they do today. If they use the current redemption link for Azure Dev Tools for Teaching, they will be redirected to sign up for Azure for Students. To learn more about Azure for Students, click here.
156+
157+
### If I have additional questions about this change, who can I contact?
158+
159+
Please use the Azure Dev Tools for Teaching support form for any questions. This is accessed in the Azure Dev Tools for Teaching Management Portal.
160+
145161
### Who is eligible to purchase Azure Dev Tools for Teaching?
146162

147163
Only academic institutions that have purchased a Volume Licensing agreement with Microsoft can enroll in Azure Dev Tools for Teaching.

articles/service-bus-messaging/enable-partitions-premium.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ Service Bus partitions enable queues and topics, or messaging entities, to be pa
1212

1313
> [!NOTE]
1414
> - Partitioning can be enabled during namespace creation in the Premium SKU.
15-
> - We do not allow creating non-partitioned entities in a partitioned namespace.
16-
> - It's not possible to change the partitioning option on any existing namespace. The number of partitions can only be set during namespace creation.
17-
> - The assigned messaging units are always a multiplier of the amount of partitions in a namespace, and are equally distributed across the partitions. For example, in a namespace with 16MU and 4 partitions, each partition will be assigned 4MU.
18-
> - When creating a partitioned namespace in a region [that supports Availability Zones](service-bus-outages-disasters.md#availability-zones), this will automatically enabled on the namespace.
19-
> - Multiple partitions with lower messaging units (MU) give you a better performance over a single partition with higher MUs.
15+
> - Creating non-partitioned entities in a partitioned namespace isn't allowed.
16+
> - Changing the partitioning option on any existing namespace isn't possible. The number of partitions can only be set during namespace creation.
17+
> - The number of assigned messaging units are always a multiplier of the number of partitions in a namespace, and are equally distributed across the partitions. For example, in a namespace with 16MU and 4 partitions, each partition is assigned 4MU.
18+
> - Using multiple partitions with lower messaging units (MU) gives you a better performance over a single partition with higher MUs.
2019
> - When using the Service Bus [Geo-disaster recovery](service-bus-geo-dr.md) feature, ensure not to pair a partitioned namespace with a non-partitioned namespace.
21-
> - It is not possible to [migrate](service-bus-migrate-standard-premium.md) a standard SKU namespace to a Premium SKU partitioned namespace.
20+
> - It's not possible to [migrate](service-bus-migrate-standard-premium.md) a standard SKU namespace to a Premium SKU partitioned namespace.
2221
> - JMS is currently not supported on partitioned namespaces.
23-
> - The feature is currently available in all regions except West India.
22+
> - Batching messages with distinct SessionId or PartitionKey isn't supported on partitioned namespaces.
23+
> - This feature is currently available in all regions except West India and Austria East.
2424
2525
## Use Azure portal
2626
When creating a **namespace** in the Azure portal, set the **Partitioning** to **Enabled** and choose the number of partitions, as shown in the following image.
@@ -89,7 +89,7 @@ To **create a namespace with partitioning enabled**, set `partitions` to a numbe
8989
```
9090

9191
## Next steps
92-
Try the samples in the language of your choice to explore Azure Service Bus features.
92+
Explore Azure Service Bus features using the samples in the language of your choice.
9393

9494
- [Azure Service Bus client library samples for .NET (latest)](/samples/azure/azure-sdk-for-net/azuremessagingservicebus-samples/)
9595
- [Azure Service Bus client library samples for Java (latest)](/samples/azure/azure-sdk-for-java/servicebus-samples/)

articles/storage/blobs/blob-inventory.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,16 @@ If a container or directory is deleted with soft-delete enabled, then the contai
434434

435435
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.
436436

437+
### Handling duplicates in Blob Inventory
438+
439+
Blob Inventory operates on a distributed system, which means that in rare cases, duplicate blob entries might appear in your reports.
440+
441+
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.
442+
443+
444+
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.
445+
446+
437447
## Next steps
438448

439449
- [Enable Azure Storage blob inventory reports](blob-inventory-how-to.md)

articles/storage/files/files-whats-new.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@ Azure Files and Azure File Sync are updated regularly to offer new features and
1717

1818
## What's new in 2025
1919

20+
### 2025 quarter 3 (July, August, September)
21+
22+
#### Azure File Sync Agent now available via Azure Arc extension
23+
24+
Windows servers connected through Azure Arc can now install the Azure File Sync agent using a new extension called Azure File Sync Agent for Windows. The new extension is published by Microsoft and can be managed using the Azure Portal, PowerShell, or Azure CLI. To learn more, see the [Azure File Sync agent extension documentation](../file-sync/file-sync-extension.md).
25+
2026
### 2025 quarter 2 (April, May, June)
2127

2228
#### Encryption in Transit (EiT) for NFS file shares is now generally available

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,23 @@ ms.date: 02/26/2025
1717

1818
This article provides the details on security vulnerabilities and Ubuntu Pro support in Azure Update Manager.
1919

20-
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.
20+
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.
2121

22-
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.
22+
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.
23+
24+
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`).
2325

2426

2527
## Ubuntu Pro on Azure Update Manager
2628

27-
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.
29+
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.
2830

2931
:::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":::
3032

3133
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.
3234

3335
> [!NOTE]
34-
> - [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.
36+
> 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).
3537
> - Ubuntu offers 20.04 LTS and 22.04 LTS as a migration from 18.04 LTS. [Learn more](https://ubuntu.com/18-04/azure).
3638
3739

0 commit comments

Comments
 (0)