Skip to content

Commit edd83f8

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into us423686-vnet-qs-combo
2 parents ac98067 + c3362a1 commit edd83f8

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

articles/cost-management-billing/reservations/azure-openai.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ When the reservation expires, Azure OpenAI Service deployments continue to run b
3232

3333
## Renewal options
3434

35-
You can choose to enable automatic renewal of reservations by selecting the option in the renewal settings or at time of purchase. With Azure OpenAI Service reservation auto renewal, the reservation renews using the same reservation order ID, and a new reservation doesn't get purchased. You can also choose to replace this reservation with a new reservation purchase in renewal settings and a replacement reservation is purchased when the reservation expires. By default, the replacement reservation has the same attributes as the expiring reservation. You can optionally change the name, billing frequency, term, or quantity in the renewal settings. Any user with owner access on the reservation and the subscription used for billing can set up renewal.
35+
You can choose to enable automatic renewal of reservations by selecting the option in the renewal settings or at time of purchase. With Azure OpenAI Service reservation auto renewal, the reservation renews using the same reservation order ID, and a new reservation doesn't get purchased. You can also choose to replace this reservation with a new reservation purchase in renewal settings and a replacement reservation is purchased when the reservation expires. By default, the replacement reservation has the same attributes as the expiring reservation but will be set to auto-renew off by default. You can optionally change the name, billing frequency, term, or quantity in the renewal settings. Any user with owner access on the reservation and the subscription used for billing can set up renewal.
36+
When the reservation is set to auto-renew on same reservation order ID, the auto-renew of this reservation is set to auto-renew on until you choose to set it off. At time of purchase, if you have chosen to set auto-renewal on, for 1-month term the reservation automatically renews on same reservation order ID, while 1-year term will result in purchasing a replacement reservation.
3637

3738
## Prerequisites
3839

articles/storage/file-sync/file-sync-release-notes.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: storage
55
author: wmgries
66
ms.service: azure-file-storage
77
ms.topic: release-notes
8-
ms.date: 4/23/2025
8+
ms.date: 04/23/2025
99
ms.author: wgries
1010
---
1111

@@ -106,7 +106,7 @@ For more information on how to install and configure the Azure File Sync agent w
106106
- The agent installation package is for a specific operating system version. If a server with an Azure File Sync agent installed is upgraded to a newer operating system version, the existing agent must be uninstalled. Restart the server and then install the agent for the new server operating system (Windows Server 2016, Windows Server 2019, Windows Server 2022 or Windows Server 2025).
107107
- The agent requires at least 2 GiB of memory. If the server is running in a virtual machine with dynamic memory enabled, the VM should be configured with a minimum 2048 MiB of memory. See [Recommended system resources](file-sync-planning.md#recommended-system-resources) for more information.
108108
- The agent uses TLS 1.2 or 1.3 (Windows Server 2022 or newer) by default and TLS 1.0 and 1.1 are not supported.
109-
- Server registration using the [Register-AzStorageSyncServer](https://learn.microsoft.com/powershell/module/az.storagesync/register-azstoragesyncserver?view=azps-13.4.0) and ServerRegistration.exe require .NET Framework 4.7.2. or higher
109+
- Server registration using the [Register-AzStorageSyncServer](/powershell/module/az.storagesync/register-azstoragesyncserver) and ServerRegistration.exe require .NET Framework 4.7.2. or higher
110110
- The Storage Sync Agent (FileSyncSvc) service doesn't support server endpoints located on a volume that has the system volume information (SVI) directory compressed. If the SVI directory is compressed, the Storage Sync Agent (FileSyncSvc) service will fail to start.
111111
- Agent installation can fail with error **0x80c84111** if required Windows security updates are missing. To prevent this issue, make sure the following updates are installed based on your server version:
112112
- Windows Server 2012 R2: [KB5021653](https://support.microsoft.com/topic/kb5021653-out-of-band-update-for-windows-server-2012-r2-november-17-2022-8e6ec2e9-6373-46d7-95bc-852f992fd1ff)
@@ -198,7 +198,7 @@ For more information on how to install and configure the Azure File Sync agent w
198198
- The agent installation package is for a specific operating system version. If a server with an Azure File Sync agent installed is upgraded to a newer operating system version, the existing agent must be uninstalled. Restart the server and then install the agent for the new server operating system (Windows Server 2016, Windows Server 2019, Windows Server 2022 or Windows Server 2025).
199199
- The agent requires at least 2 GiB of memory. If the server is running in a virtual machine with dynamic memory enabled, the VM should be configured with a minimum 2048 MiB of memory. See [Recommended system resources](file-sync-planning.md#recommended-system-resources) for more information.
200200
- The agent uses TLS 1.2 or 1.3 (Windows Server 2022 or newer) by default and TLS 1.0 and 1.1 are not supported.
201-
- Server registration using the [Register-AzStorageSyncServer](https://learn.microsoft.com/powershell/module/az.storagesync/register-azstoragesyncserver?view=azps-13.4.0) and ServerRegistration.exe require .NET Framework 4.7.2. or higher
201+
- Server registration using the [Register-AzStorageSyncServer](/powershell/module/az.storagesync/register-azstoragesyncserver) and ServerRegistration.exe require .NET Framework 4.7.2. or higher
202202
- The Storage Sync Agent (FileSyncSvc) service doesn't support server endpoints located on a volume that has the system volume information (SVI) directory compressed. If the SVI directory is compressed, the Storage Sync Agent (FileSyncSvc) service will fail to start.
203203

204204
### Interoperability

articles/storage/files/smb-performance.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ Supported regions:
201201
- Brazil South
202202
- Canada Central
203203
- Canada East
204+
- North Europe
204205
- France Central
205206
- Germany West Central
206207
- Central India
@@ -218,7 +219,9 @@ Supported regions:
218219
- Sweden Central
219220
- Switzerland North
220221
- UAE North
222+
- North Central US
221223
- South Central US
224+
- West US
222225
- West US 2
223226
- West US 3
224227
- West Central US

0 commit comments

Comments
 (0)