Skip to content

Commit fac7627

Browse files
authored
Merge pull request #261786 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)
2 parents fa9de5c + b1d5f7e commit fac7627

File tree

5 files changed

+8
-5
lines changed

5 files changed

+8
-5
lines changed

articles/azure-monitor/logs/private-link-design.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ Azure Monitor Windows agent version 1.1.1.0 or higher (by using [data collection
195195

196196
#### Azure Monitor Linux agents
197197

198-
Azure Monitor Windows agent version 1.10.5.0 or higher (by using [data collection endpoints](../essentials/data-collection-endpoint-overview.md)).
198+
Azure Monitor Linux agent version 1.10.5.0 or higher (by using [data collection endpoints](../essentials/data-collection-endpoint-overview.md)).
199199

200200
#### Log Analytics Windows agent (on deprecation path)
201201

articles/migrate/migrate-support-matrix.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ Migration and modernization | N/A | Migrate [VMware VMs](tutorial-migrate-vmware
4242
[Device 42](https://go.microsoft.com/fwlink/?linkid=2097158) | Assess VMware VMs, Hyper-V VMs, physical servers, and other cloud workloads.| N/A
4343
[DMA](/sql/dma/dma-overview) | Assess SQL Server databases. | N/A
4444
[DMS](../dms/dms-overview.md) | N/A | Migrate SQL Server, Oracle, MySQL, PostgreSQL, MongoDB.
45+
[Dr Migrate](https://www.altra.cloud/products/dr-migrate) | Assess VMware VMs, Hyper-V VMs, physical servers, SQL Server databases, and other cloud workloads. | N/A
4546
[Lakeside](https://go.microsoft.com/fwlink/?linkid=2104908) | Assess virtual desktop infrastructure (VDI) | N/A
4647
[Movere](https://www.movere.io/) | Assess VMware VMs, Hyper-V VMs, Xen VMs, physical servers, workstations (including VDI) and other cloud workloads. | N/A
4748
[RackWare](https://go.microsoft.com/fwlink/?linkid=2102735) | N/A | Migrate VMware VMs, Hyper-V VMs, Xen VMs, KVM VMs, physical servers, and other cloud workloads

articles/mysql/flexible-server/concepts-networking-vnet.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Here are some concepts to be familiar with when using virtual networks with Azur
7878
> [!IMPORTANT]
7979
> Private DNS zone names must end with `mysql.database.azure.com`. If you are connecting to an Azure Database for MySQL flexible server instance with SSL and you're using an option to perform full verification (sslmode=VERIFY_IDENTITY) with certificate subject name, use \<servername\>.mysql.database.azure.com in your connection string.
8080
81-
Learn how to create a Azure Database for MySQL flexible server instance with private access (VNet integration) in [the Azure portal](how-to-manage-virtual-network-portal.md) or [the Azure CLI](how-to-manage-virtual-network-cli.md).
81+
Learn how to create an Azure Database for MySQL flexible server instance with private access (VNet integration) in [the Azure portal](how-to-manage-virtual-network-portal.md) or [the Azure CLI](how-to-manage-virtual-network-cli.md).
8282

8383
## Integration with a custom DNS server
8484

articles/postgresql/flexible-server/tutorial-django-app-service-postgres.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ When running locally, the app is using a local Sqlite3 database and doesn't inte
215215
In `polls/models.py`, locate the line that begins with `choice_text` and change the `max_length` parameter to 100:
216216

217217
```python
218-
# Find this lie of code and set max_length to 100 instead of 200
218+
# Find this line of code and set max_length to 100 instead of 200
219219
220220
choice_text = models.CharField(max_length=100)
221221
```

articles/virtual-machines/ncv3-series.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: vikancha-MSFT
55
ms.service: virtual-machines
66
ms.subservice: sizes
77
ms.topic: conceptual
8-
ms.date: 12/21/2022
8+
ms.date: 12/20/2023
99
ms.author: vikancha
1010
---
1111

@@ -20,12 +20,14 @@ NCv3-series VMs are powered by NVIDIA Tesla V100 GPUs. These GPUs can provide 1.
2020
[Ultra Disks](disks-types.md#ultra-disks): Supported ([Learn more](https://techcommunity.microsoft.com/t5/azure-compute/ultra-disk-storage-for-hpc-and-gpu-vms/ba-p/2189312) about availability, usage and performance) <br>
2121
[Live Migration](maintenance-and-updates.md): Not Supported<br>
2222
[Memory Preserving Updates](maintenance-and-updates.md): Not Supported<br>
23-
[VM Generation Support](generation-2.md): Generation 1 and 2<br>
23+
[VM Generation Support](generation-2.md): Generation 1 and 2*<br>
2424
[Accelerated Networking](../virtual-network/create-vm-accelerated-networking-cli.md): Not Supported<br>
2525
[Ephemeral OS Disks](ephemeral-os-disks.md): Supported<br>
2626
Nvidia NVLink Interconnect: Not Supported<br>
2727
[Nested Virtualization](/virtualization/hyper-v-on-windows/user-guide/nested-virtualization): Not Supported <br>
2828

29+
>*Standard_NC24rs_v3 is not supported on Generation 2 VMs.
30+
2931
> [!IMPORTANT]
3032
> For this VM series, the vCPU (core) quota in your subscription is initially set to 0 in each region. [Request a vCPU quota increase](../azure-portal/supportability/regional-quota-requests.md) for this series in an [available region](https://azure.microsoft.com/regions/services/). These SKUs aren't available to trial or Visual Studio Subscriber Azure subscriptions. Your subscription level might not support selecting or deploying these SKUs.
3133
>

0 commit comments

Comments
 (0)